diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8b7d8f795097f1ae0df64d4376f769955e4486f8..88f0fdbb85fff3d18b4d9c369dc49428ff7e45d3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -108,10 +108,6 @@ deploy:
     SSH_PRIVATE_KEY: $DOKKU_SSH_PRIVATE_KEY
     GIT_DEPTH: "0"
   rules: !reference [.upstream-deploy-production-rules, rules]
-  before_script:
-    - chmod +x .gitlab/dokku-ci-pre-deploy.sh
-    - mkdir -p ./bin
-    - cp .gitlab/dokku-ci-pre-deploy.sh ./bin/ci-pre-deploy
   script:
     - dokku-deploy
   after_script:
@@ -134,7 +130,7 @@ bdd-test:
   before_script:
     - apt-get update && apt-get install -y firefox
     - sed -i "s#headless.mode = false#headless.mode = true#" src/test/resources/serenity.conf
-    - sed -i "s#http://localhost:8080#http://sitodo-pmpl.dokku-ppl.cs.ui.ac.id#" src/test/resources/serenity.conf
+    - sed -i "s#http://localhost:8080#http://sitodo-pmpl.dokku-ppl.cs.ui.ac.id:8080#" src/test/resources/serenity.conf
   script:
     - mvn -P bdd clean verify
   dependencies: []
diff --git a/.gitlab/dokku-ci-pre-deploy.sh b/.gitlab/dokku-ci-pre-deploy.sh
index dcd44810e1edc2042b0f2b682e23ae245082cb7f..17da453e5fa385b4bb0b4a3cb43da31520db63aa 100644
--- a/.gitlab/dokku-ci-pre-deploy.sh
+++ b/.gitlab/dokku-ci-pre-deploy.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -l
 # Based on: https://github.com/dokku/ci-docker-image/pull/28
 # TODO: Allow custom SPRING_PROFILES_ACTIVE set from the CI
-ssh "$SSH_REMOTE" -- config:set "$APP_NAME" "SPRING_PROFILES_ACTIVE=hsqldb"
-echo "Configured the app to run using hsqldb profile"
+ssh "$SSH_REMOTE" -- config:set "$APP_NAME" "SPRING_PROFILES_ACTIVE=postgresql"
+echo "Configured the app to run using postgresql profile"