diff --git a/.github/workflows/features.yml b/.github/workflows/features.yml
index 066ae6eae..6d8d30063 100644
--- a/.github/workflows/features.yml
+++ b/.github/workflows/features.yml
@@ -10,39 +10,39 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        shell: bash
         working-directory: /usr/src/rmt-server
     container:
       image: registry.opensuse.org/systemsmanagement/scc/containers/15.5/rmt-ci-container:latest
       options: --user root
-    services:
-      mysql:
-        image: mysql:5.7
-        env:
-          MYSQL_DATABASE: rmt_features
-          MYSQL_USER: rmt
-          MYSQL_PASSWORD: rmt
-          MYSQL_ROOT_PASSWORD: root
-        ports:
-          - 3306:3306
-        options: >-
-          --health-cmd="mysqladmin ping"
-          --health-interval=10s
-          --health-timeout=5s
-          --health-retries=3
+    # services:
+    #   mysql:
+    #     image: mysql:5.7
+    #     env:
+    #       MYSQL_DATABASE: rmt_features
+    #       MYSQL_USER: rmt
+    #       MYSQL_PASSWORD: rmt
+    #       MYSQL_ROOT_PASSWORD: root
+    #     ports:
+    #       - 3306:3306
+    #     options: >-
+    #       --health-cmd="mysqladmin ping"
+    #       --health-interval=10s
+    #       --health-timeout=5s
+    #       --health-retries=3
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
-      - name: build rpm
+      - name: copy checkout to /usr/src/rmt-server
         run: |
-          rmt-build-rpm
+          cp -r $GITHUB_WORKSPACE/* /usr/src/rmt-server
 
-      - name: configure rmt
-        run: |
-          rmt-configure
+      - name: install depdendencies
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
 
-      - name: run feature tests
+      - name: build rpm
         run: |
-          rmt-run-feature-tests
+          bash ci/rmt-build-rpm
diff --git a/Makefile b/Makefile
index 2e46640c1..e53563184 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ clean:
 	rm -rf $(NAME)-$(VERSION)/
 
 man:
-	bundle exec ronn --roff --pipe --manual RMT MANUAL.md > rmt-cli.8 && gzip -f rmt-cli.8
+	ronn --roff --pipe --manual RMT MANUAL.md > rmt-cli.8 && gzip -f rmt-cli.8
 	mv rmt-cli.8.gz package/obs
 
 dist: clean man
diff --git a/ci/Dockerfile b/ci/Dockerfile
index e8e5b9fc3..d6719fcaf 100644
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -11,21 +11,9 @@ RUN zypper --non-interactive in make chrpath fdupes gcc libcurl-devel libffi-dev
 RUN update-alternatives --install /usr/bin/bundle bundle /usr/bin/bundle.ruby2.5 5 && \
     update-alternatives --install /usr/bin/bundler bundler /usr/bin/bundler.ruby2.5 5
 
-VOLUME /usr/src/rmt-server
-VOLUME /usr/
+RUN mkdir /usr/src/rmt-server
 
 ARG SCC_USERNAME
 ARG SCC_PASSWORD
 
-# Prepare ruby environment
-ENV NOKOGIRI_USE_SYSTEM_LIBRARIES 1
-
-# Add rmt ci/development scripts
-RUN mkdir -p /usr/src/rmt-server /usr/local/bin
-
-COPY rmt-build-rpm /usr/local/bin/
-COPY rmt-configure /usr/local/bin/
-COPY rmt-console /usr/local/bin/
-COPY rmt-run-feature-tests /usr/local/bin/
-
 WORKDIR /usr/src/rmt-server