diff --git a/.circleci/config.yml b/.circleci/config.yml
index 68c1bcd86c..9838945cc6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -339,7 +339,6 @@ workflows:
             branches:
               ignore:
                 - master
-                - /rfc-18\/.*/
           context: keep-dev
       - build_token_dashboard_dapp:
           filters:
diff --git a/.github/workflows/client.yml b/.github/workflows/client.yml
index 84be265b0f..4c707ece81 100644
--- a/.github/workflows/client.yml
+++ b/.github/workflows/client.yml
@@ -17,19 +17,43 @@ jobs:
   build-and-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
-      - uses: satackey/action-docker-layer-caching@v0.0.11
-        continue-on-error: true # ignore the failure of a step and avoid terminating the job
-      - name: Run Docker build
-        run: |
-          docker build \
-            --target gobuild \
-            --tag go-build-env .
-          docker build \
-            --tag keep-client .
+      - uses: actions/checkout@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Cache Docker layers
+        uses: actions/cache@v2
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+
+      # TODO: This step was left here intentionally so we can track disk space
+      # usage for a while. We were trying to fight problems with out of disk space
+      # that happened due to the size of data restored from cache. The cache size
+      # was growing linearly with subsequent workflow runs. We want to observe
+      # available disk space for `/`. Fresh execution starts with 20 GB, we expect
+      # to have no less than 15 GB after the cache is restored.
+      - run: sudo df -h
+
+      - name: Build Docker Build Image
+        uses: docker/build-push-action@v2
+        with:
+          target: gobuild
+          tags: go-build-env
+          build-args: |
+            REVISION=${{ github.sha }}
+          # VERSION= ? TODO: Configure version, sample: 1.7.6
+          load: true # load image to local registry to use it in next steps
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
+
       - name: Create test results directory
         run: |
           mkdir test-results
+
       - name: Run Go tests
         run: |
           docker run \
@@ -37,6 +61,7 @@ jobs:
             --workdir /go/src/github.com/keep-network/keep-core \
             go-build-env \
             gotestsum --junitfile /mnt/test-results/unit-tests.xml
+
       - name: Publish unit test results
         uses: EnricoMi/publish-unit-test-result-action@v1.7
         if: always() # guarantees that this action always runs, even if earlier steps fail
@@ -45,3 +70,15 @@ jobs:
           files: ./test-results/unit-tests.xml
           check_name: Go Test Results # name under which test results will be presented in GitHub (optional)
           comment_on_pr: false # turns off commenting on Pull Requests
+
+      # This step is executed after the tests as we want to configure it eventually
+      # as image publication step.
+      - name: Build Docker Runtime Image
+        uses: docker/build-push-action@v2
+        with:
+          tags: keep-client
+          labels: |
+            revision=${{ github.sha }}
+          # TODO: Check branch name and publish to a registry accordingly to the
+          # environment.
+          # push: true # publish to registry
diff --git a/Dockerfile b/Dockerfile
index ed0e82569f..92a6ff63a9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,5 @@
 FROM golang:1.13.6-alpine3.10 AS gobuild
 
-ARG VERSION
-ARG REVISION
-
 ENV GOPATH=/go \
 	GOBIN=/go/bin \
 	APP_NAME=keep-client \
@@ -63,6 +60,10 @@ RUN go generate ./.../gen
 COPY ./ $APP_DIR/
 RUN go generate ./pkg/gen
 
+# Client Versioning.
+ARG VERSION
+ARG REVISION
+
 RUN GOOS=linux go build -ldflags "-X main.version=$VERSION -X main.revision=$REVISION" -a -o $APP_NAME ./ && \
 	mv $APP_NAME $BIN_PATH