diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 465c878234c6c2b115c695b6b5f8a4e042cd1d18..63ec20ab9ff5c9bd811ac5c0ca7b4ca569399f1b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -103,11 +103,9 @@ pages:
 # ============================== Staging section ============================= #
 .staging_template: &staging_definition
   stage: staging
-  image: docker:latest
+  image: docker/compose
   only:
     - master
-  before_script:
-    - apk add --update py-pip && pip install docker-compose
 
 staging:
   <<: *staging_definition
diff --git a/docker-compose.yml b/docker-compose.yml
index 94f997adde3f7cfba2329f76134dda9c73c6f306..24f35a3540e77b09ee7e3d3fd4656c9a9ddb6bba 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,8 +13,8 @@ services:
   grady:
     image: docker.gitlab.gwdg.de/j.michal/grady:master
     command: >
-        bash -c "./manage.py maketestdata &&
-                 ./deploy.sh"
+        sh -c "./manage.py maketestdata &&
+               ./deploy.sh"
     depends_on:
       - postgres
     restart: always