diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5256d0dbe..497225703 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 default:
-  image: registry.znuny.com/docker/zammad-ruby:2.6.6
+  image: registry.znuny.com/docker/zammad-ci:stable
 
 include:
   - local: '/.gitlab/ci/base.yml'
@@ -39,12 +39,13 @@ variables:
 # as a key for the cache to avoid cache growth and incompatibilities between
 # the gems. Search hook: 2.6.6 (change it when updating the Ruby version too)
 cache:
-  key: "ruby266"
+  key: "centos7ruby266"
   paths:
     - vendor/ruby
 
 # Initialize application env
 before_script:
+  - source /etc/profile.d/rvm.sh
   - bundle install -j $(nproc) --path vendor
   - bundle exec ruby script/build/database_config.rb
 
diff --git a/.gitlab/ci/pre.yml b/.gitlab/ci/pre.yml
index eb98e0ec6..7a0e80845 100644
--- a/.gitlab/ci/pre.yml
+++ b/.gitlab/ci/pre.yml
@@ -5,7 +5,7 @@
     - .tags_docker
     - .rules_singletest
   before_script:
-    - '' # disable before_script for pre "non-application" env
+    - source /etc/profile.d/rvm.sh # ensure RVM is loaded
 
 rubocop:
   <<: *template_pre
@@ -29,5 +29,7 @@ github:
   <<: *template_pre
   tags:
     - deploy
+  before_script:
+    - "" # no RVM present in deploy ENV
   script:
-    - script/build/sync_repo.sh git@github.com:zammad/zammad.git
\ No newline at end of file
+    - script/build/sync_repo.sh git@github.com:zammad/zammad.git