diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dd7ca3537225c72e864fefdf3e2dc6114b921557..962a0cd90ed0fecedd9b3b43acb2d3a32e1636ef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,6 +16,8 @@ build-faircoind:
       - $CMD =~ /build/
   before_script:
     - mkdir -p ~/.faircoin2
+    - source ${FAIRCOIN_CONF}
+    - echo -e "rpcconnect=${rpcconnect}\nrpcport=${rpcport}\nrpcuser=${rpcuser}\nrpcpassword=${rpcpassword}\ntxindex=1" > ~/.faircoin2/faircoin.conf
   script:
     - docker-compose down
     - docker-compose build
diff --git a/Dockerfile b/Dockerfile
index 8a84719e6103a350690ce329279aee5e3000820a..bad580e9dd9e65cf8327d586fae2a44d86618d9b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -66,7 +66,7 @@ RUN mv ./faircoin-cli /home/faircoin/faircoin-cli
 WORKDIR /home/faircoin
 ARG FAIRCOIN_CONF
 ARG FAIRCOIN_PORT
-RUN ./faircoind -daemon -disablewallet -reindex -port=$FAIRCOIN_PORT -conf="$FAIRCOIN_CONF" && \
+RUN ./faircoind -daemon -disablewallet -reindex -port=$FAIRCOIN_PORT && \
     sleep 60 && \
     ./faircoin-cli stop && \
     sleep 10
diff --git a/docker-compose.yml b/docker-compose.yml
index 503e826e8d03e069b0de90895b749ebe119162e1..3481c114b13050a9d901ba421ca26086dedd24b6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,11 +9,10 @@ services:
         source_repository: "https://github.com/faircoin/faircoin.git"
         GITLAB_RUNNER_UID: "${GITLAB_RUNNER_UID}"
         GITLAB_RUNNER_GID: "${GITLAB_RUNNER_GID}"
-        FAIRCOIN_CONF: "${FAIRCOIN_CONF}"
         FAIRCOIN_PORT: 40414
     container_name: FairCoin.Co-faircoind
     restart: always
-    command: '-disablewallet -conf="${FAIRCOIN_CONF}" -port=40414 -blocknotify="${CI_PROJECT_DIR}/blocknotify.sh"'
+    command: '-disablewallet -conf="${FAIRCOIN_CONF}" -port=40414'
 #    command: '-disablewallet -conf="${FAIRCOIN_CONF}" -blocknotify="${BLOCKNOTIFY}"'
     network_mode: "host"
     user: "${GITLAB_RUNNER_UID}:${GITLAB_RUNNER_GID}"