diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 77d7235a75acf5758f4686c66c268e92b40ce43b..e478952f5278723404056c6a16c12d72726fd5f6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -82,9 +82,9 @@ deploy:
   extends: .base-dokku-deploy
   rules: !reference [.upstream-deploy-production-rules, rules]
   variables:
-    DOKKU_APP_NAME: spring-petclinic-rest
-    DOKKU_SSH_REMOTE: "ssh://dokku@dokku-ppl.cs.ui.ac.id:22"
-    DOKKU_SSH_PRIVATE_KEY: $PRODUCTION_SSH_PRIVATE_KEY
+    APP_NAME: spring-petclinic-rest
+    SSH_REMOTE: "ssh://dokku@dokku-ppl.cs.ui.ac.id:22"
+    SSH_PRIVATE_KEY: $PRODUCTION_SSH_PRIVATE_KEY
   script:
     - dokku network:exists "${APP_NAME}-network" || dokku network:create "${APP_NAME}-network"
     - dokku postgres:exists "${APP_NAME}-database" || dokku postgres:create "${APP_NAME}-database" \
diff --git a/.gitlab/ci/deploy-template.gitlab-ci.yml b/.gitlab/ci/deploy-template.gitlab-ci.yml
index 94a55c0bcd0cdda5d29bbe41b8d2523fe8e3d072..52ff667004a9248cd1c7c7145266ce85f207cfb9 100644
--- a/.gitlab/ci/deploy-template.gitlab-ci.yml
+++ b/.gitlab/ci/deploy-template.gitlab-ci.yml
@@ -3,16 +3,12 @@
   stage: deploy
   image: docker.io/dokku/ci-docker-image:0.9.3
   variables:
-    APP_NAME: "${DOKKU_APP_NAME:-$CI_PROJECT_PATH_SLUG}"
-    SSH_REMOTE: "${DOKKU_SSH_REMOTE:-ssh://dokku@dokku-ppl.cs.ui.ac.id:22}"
-    SSH_PRIVATE_KEY: "${DOKKU_SSH_PRIVATE_KEY:-}"
+    APP_NAME: $CI_PROJECT_PATH_SLUG
+    SSH_REMOTE: "ssh://dokku@dokku-ppl.cs.ui.ac.id:22"
+    SSH_PRIVATE_KEY: ""
     BRANCH: $CI_DEFAULT_BRANCH
     GIT_DEPTH: 0
   before_script:
     - chmod +x .gitlab/bin/dokku.sh
     - cp .gitlab/bin/dokku.sh /bin/dokku
-    - echo "[DEBUG] APP_NAME is $APP_NAME"
-    - echo "[DEBUG] DOKKU_APP_NAME is $DOKKU_APP_NAME"
-    - echo "[DEBUG] SSH_REMOTE is $SSH_REMOTE"
-    - echo "[DEBUG] DOKKU_SSH_REMOTE is $DOKKU_SSH_REMOTE"
   dependencies: []