diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8047e7bc..e7e4efeb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,10 +14,11 @@
   stage_test: &stage_test 'test'
   # `image`
   image_commitlint: &image_commitlint 'myii/ssf-commitlint:11'
-  image_dindruby: &image_dindruby 'myii/ssf-dind-ruby:2.7.1-r3'
-  image_precommit: &image_precommit
-    name: 'myii/ssf-pre-commit:2.9.2'
-    entrypoint: ['/bin/bash', '-c']
+  image_dindruby: &image_dindruby
+    'dafyddj/ci-dind-python-ruby:2.0.0'
+  image_dindrubybionic: &image_dindrubybionic
+    'dafyddj/ci-dind-python-ruby:2.0.0'
+  image_precommit: &image_precommit 'dafyddj/ci-pre-commit:2.0.2'
   image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest'
   image_semantic-release: &image_semanticrelease 'myii/ssf-semantic-release:15.14'
   # `services`