diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b6a7b38..a5b6d20 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,44 +1,6 @@
 # Free-bsd and windows are currently unsupport at invent.kde.org. Disabling so build will pass
 include:
   - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-before.yml
   - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-extragear-linux.yml
 #  - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-extragear-freebsd.yml
 #  - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-extragear-windows.yml
-
-#reenable test stage for our custom build was disabled by ci-tooling config
-stages:
-  - build
-  - test
-
-build_ubuntu_18_04:
-  stage: build
-  image: reporter123/cmake:bionic
-
-  before_script:
-     - apt-get update
-     - apt-get install -y libqt5test5 gettext qtbase5-dev extra-cmake-modules libkf5i18n-dev libkf5coreaddons-dev libkf5iconthemes-dev libkf5parts-dev libkf5doctools-dev libkf5crash-dev libboost-signals-dev
-  script:
-    - cmake -DBUILD_TESTING=YES .
-    - make
-  artifacts:
-    untracked: true
-  retry:
-    max: 1
-    when:
-      - runner_system_failure
-      - stuck_or_timeout_failure
-
-ubuntu_18_04_test:
-    stage: test
-    needs: ["build_ubuntu_18_04"]
-    image: reporter123/cmake:bionic
-    before_script:
-      - apt-get update
-      - apt-get install -y libqt5test5
-    script:
-      - make ARGS="-V -E appstreamtest" test #exclude appstreamtest this does not run properly in my image
-    retry:
-      max: 2
-      when:
-       - runner_system_failure
-       - stuck_or_timeout_failure
diff --git a/.gitlab-nonkde.yml b/.gitlab-nonkde.yml
index 1b82f82..c303538 100644
--- a/.gitlab-nonkde.yml
+++ b/.gitlab-nonkde.yml
@@ -1,36 +1,35 @@
 stages:
   - build
   - test
 
-build_ubuntu_18_04:
+build_ubuntu_18_04-boost(1.66):
   stage: build
-  image: reporter123/cmake:bionic
-
-  before_script:
-     - apt-get update
-     - apt-get install -y libqt5test5 gettext qtbase5-dev extra-cmake-modules libkf5i18n-dev libkf5coreaddons-dev libkf5iconthemes-dev libkf5parts-dev libkf5doctools-dev libkf5crash-dev libboost-signals-dev
+  image: reporter123/kdiff3env:bionic
+  #before_script:
+  #   - apt-get update
+  #   - apt-get install -y libqt5test5 gettext qtbase5-dev extra-cmake-modules libkf5i18n-dev libkf5coreaddons-dev libkf5iconthemes-dev libkf5parts-dev libkf5doctools-dev libkf5crash-dev libboost-dev
   script:
     - cmake -DBUILD_TESTING=YES .
     - make
   artifacts:
     untracked: true
   retry:
     max: 2
     when:
       - runner_system_failure
       - stuck_or_timeout_failure
 
 ubuntu_18_04_test:
     stage: test
-    needs: ["build_ubuntu_18_04"]
-    image: reporter123/cmake:bionic
+    needs: ["build_ubuntu_18_04-boost(1.66)"]
+    image: reporter123/kdiff3env:bionic
     before_script:
       - apt-get update
       - apt-get install -y libqt5test5
     script:
       - make ARGS="-V -E appstreamtest" test #exclude appstreamtest this does not run properly in my image
     retry:
       max: 2
       when:
        - runner_system_failure
        - stuck_or_timeout_failure