diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 95fd984560f35f5d931a15be69f839e5d7716db8..2d4b5cbf1bb1b1db4e491e0ff3910acecba658c2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,6 +15,8 @@ build-faircoind:
     variables:
       - $CMD =~ /build/
   before_script:
+    - export RUNNER_UID=`id -u`
+    - export RUNNER_GID=`id -g`
     - mkdir -p ~/.faircoin2
     - source ${FAIRCOIN_CONF}
     - echo -e "rpcconnect=${rpcconnect}\nrpcport=${rpcport}\nrpcuser=${rpcuser}\nrpcpassword=${rpcpassword}\ntxindex=1" > ~/.faircoin2/faircoin.conf
@@ -34,6 +36,8 @@ start-faircoind:
     variables:
       - $CMD =~ /build|start/
   before_script:
+    - export RUNNER_UID=`id -u`
+    - export RUNNER_GID=`id -g`
     - chmod +x ./script/blocknotify.sh
   script:
     - docker-compose stop
diff --git a/Dockerfile b/Dockerfile
index 3e81e67331fa4162b6f4e682cd811d645128542e..49265e64e2fb6be73a01c84ac4e4d5031139c151 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,10 +35,10 @@ RUN rm -rf /var/lib/apt/lists/* && \
 
 #####################################################################################root##
 ### create and run user account to image ##################################################
-ARG GITLAB_RUNNER_GID
-ARG GITLAB_RUNNER_UID
-RUN groupadd -g $GITLAB_RUNNER_GID faircoin
-RUN useradd --create-home --shell /bin/bash faircoin --uid $GITLAB_RUNNER_UID --gid $GITLAB_RUNNER_GID
+ARG RUNNER_GID
+ARG RUNNER_UID
+RUN groupadd -g $RUNNER_GID faircoin
+RUN useradd --create-home --shell /bin/bash faircoin --uid $RUNNER_UID --gid $RUNNER_GID
 
 USER faircoin
 #################################################################################faircoin##
diff --git a/docker-compose.yml b/docker-compose.yml
index a6a6e9910c96763f2eae4318c1194054f9fe3978..8ffb249d7ab2b81d4f2dbad58d02c50c64b275f9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,8 +7,8 @@ services:
       context: ./
       args:
         source_repository: "https://github.com/faircoin/faircoin.git"
-        GITLAB_RUNNER_UID: "${GITLAB_RUNNER_UID}"
-        GITLAB_RUNNER_GID: "${GITLAB_RUNNER_GID}"
+        RUNNER_UID: "${RUNNER_UID}"
+        RUNNER_GID: "${RUNNER_GID}"
         FAIRCOIN_PORT: ${FAIRCOIN_PORT}
     env_file:
       - ../faircoind.tmp/FAIRCOIN_CONF
@@ -16,7 +16,7 @@ services:
     restart: always
     command: '-disablewallet -port=${FAIRCOIN_PORT} -blocknotify=/home/faircoin/script/blocknotify.sh'
     network_mode: "host"
-    user: "${GITLAB_RUNNER_UID}:${GITLAB_RUNNER_GID}"
+    user: "${RUNNER_UID}:${RUNNER_GID}"
     volumes:
       - ~/.faircoin2:/home/faircoin/.faircoin2
       - ./script:/home/faircoin/script