diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8955db62c7917764ad3251d0c6d8e3185adaad79..8493a259830c625311e6dcf47c32afbc1e598884 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -80,6 +80,6 @@ remove-faircoind:
       - $CMD =~ /remove/
   script:
     - docker-compose stop
-    - docker-compose down
+    - docker-compose down -v --rmi all --remove-orphans
   after_script:
     - rm -R ~/.faircoin2
diff --git a/docker-compose.yml b/docker-compose.yml
index 98a0a399f6ad27567d9fef91296bafb606dcb571..022e637a55a278f526c1220742f1df959cca315d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,7 +12,7 @@ services:
         FAIRCOIN_PORT: ${FAIRCOIN_PORT:-40404}
     env_file:
       - ${FAIRCOIN_CONF}
-    container_name: FairCoin.Co-faircoind
+    container_name: ${CI_PROJECT_NAME:-faircoin}-faircoind
     restart: always
     command: '-disablewallet -port=${FAIRCOIN_PORT:-40404} -blocknotify=/home/faircoin/script/blocknotify.sh'
     network_mode: "host"