diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bdc61ee077884e3e9382eae56f61669a74f6753f..ef45afcd21c30009142d4181c7e6eb6d1c247a6d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ stages:
   - build
   - restart
 
-Build:
+build-faircoind:
   stage: build
   tags:
     - FairCoin.Co
@@ -11,10 +11,12 @@ Build:
       - master
     variables:
       - $CMD =~ /build/
+  before_script:
+    - mkdir -p ~/.faircoin2
   script:
     - docker-compose build
 
-Restart:
+restart-faircoind:
   stage: restart
   tags:
     - FairCoin.Co
diff --git a/Dockerfile b/Dockerfile
index c3c923efa8bbf30a618ca41440514c18fbdf769f..ca0734ac8d8e7c538cc8c1d8ecfd5804bb12a9dc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,6 +8,9 @@ ENV LC_ALL=C.UTF-8 LANG=C.UTF-8
 RUN apt-get update -q && \
     apt-get install -qy \
         git \
+        make \
+        autotools-dev \
+        autoconf \
         libtool \
         libssl-dev \
         libboost-all-dev \
@@ -32,17 +35,29 @@ RUN rm -rf /var/lib/apt/lists/* && \
 
 #####################################################################################root##
 ### create and run user account to image ##################################################
-RUN useradd --create-home --shell /bin/bash faircoin
+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
 
 USER faircoin
 #################################################################################faircoin##
 ### download and build faircoin daemon and cli ############################################
 WORKDIR /home/faircoin
-COPY ./faircoind ./faircoind
-COPY ./faircoin-cli ./faircoin-cli
+ARG source_repository
+RUN git clone $source_repository /home/faircoin/faircoin
+
+WORKDIR /home/faircoin/faircoin
+RUN ./autogen.sh && \
+    ./configure --disable-tests --disable-bench --with-incompatible-bdb --disable-wallet && \
+    make
 
 #################################################################################faircoin##
 ### initialize blockchain with txindex=1 ##################################################
+WORKDIR /home/faircoin/faircoin/src
+RUN mv ./faircoind /home/faircoin/faircoind
+RUN mv ./faircoin-cli /home/faircoin/faircoin-cli
+
 WORKDIR /home/faircoin
 RUN ./faircoind -daemon -reindex && \
     sleep 60 && \
diff --git a/docker-compose.yml b/docker-compose.yml
index 77a9a3bf40cb81a3839ca20ee53230b04a87e0ac..7ba1d22dd87a77acfb906bbd1e342a9c1b423e3d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,13 +3,16 @@ version: "3.1"
 services:
 
   faircoin:
-    build: ./
-    container_name: FairCoin-2-V92001-nobuild
+    build:
+      context: ./
+      args:
+        GITLAB_RUNNER_UID: "${GITLAB_RUNNER_UID}"
+        GITLAB_RUNNER_GID: "${GITLAB_RUNNER_GID}"
+    container_name: FairCoin.Co-faircoind
     restart: always
-    command: '-disablewallet -conf="${FAIRCOIN_CONF}" -blocknotify="${BLOCKNOTIFY}"'
+    command: '-disablewallet -conf="${FAIRCOIN_CONF}"'
+#    command: '-disablewallet -conf="${FAIRCOIN_CONF}" -blocknotify="${BLOCKNOTIFY}"'
     network_mode: "host"
     user: "$GITLAB_RUNNER_UID:$GITLAB_RUNNER_GID"
     volumes:
-      - .faircoin2:/home/faircoin/.faircoin2
-      - ../pulse.faircoin.co/_data/faircoin:/home/faircoin/pulse.faircoin.co/data
-      - ../pulse.faircoin.co/script:/home/faircoin/pulse.faircoin.co/script
+      - ~/.faircoin2:/home/faircoin/.faircoin2
diff --git a/faircoin-cli b/faircoin-cli
deleted file mode 100755
index ee0b6cd686c31df1e0d05458250b0ea381ca14a7..0000000000000000000000000000000000000000
Binary files a/faircoin-cli and /dev/null differ
diff --git a/faircoind b/faircoind
deleted file mode 100755
index ef3d35b37c5753bc9970f8b58f4472262ac7020a..0000000000000000000000000000000000000000
Binary files a/faircoind and /dev/null differ