diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b6c03887..68c808db 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -44,17 +44,21 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
 
-      - name: Run Tests
-        run: |
-          mvn fmt:check
-          mvn clean verify
-      - uses: google-github-actions/setup-gcloud@master
+      - name: gcloud setup
+        uses: google-github-actions/setup-gcloud@master
         with:
           service_account_key: ${{ secrets.GCR_KEY }}
         # Configure docker to use the gcloud command-line tool as a credential helper
-      - run: |
+      - name: Configure GCR
+        run: |
           gcloud auth configure-docker
 
+      - name: Run Tests
+        run: |
+          export LD_LIBRARY_PATH=/usr/local/lib
+          mvn fmt:check
+          mvn clean verify
+
       - name: pr docker tag
         if: github.ref != 'refs/heads/main'
         id: tag
diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml
index a132012b..040179cb 100644
--- a/.github/workflows/manual.yml
+++ b/.github/workflows/manual.yml
@@ -34,17 +34,20 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
 
-      - name: Run Tests
-        run: |
-          mvn fmt:check
-          mvn clean verify
-      - uses: google-github-actions/setup-gcloud@master
+      - name: gcloud setup
+        uses: google-github-actions/setup-gcloud@master
         with:
           service_account_key: ${{ secrets.GCR_KEY }}
         # Configure docker to use the gcloud command-line tool as a credential helper
-      - run: |
+      - name: Configure GCR
+        run: |
           gcloud auth configure-docker
 
+      - name: Run Tests
+        run: |
+          export LD_LIBRARY_PATH=/usr/local/lib
+          mvn clean verify
+
       - name: pr docker tag
         if: github.ref != 'refs/heads/main'
         id: tag
diff --git a/docker-compose.yml b/docker-compose.yml
index 7a3499b1..4ffc73d6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
     - "46672:15672"
  survey:
    container_name: survey-it
-   image: sdcplatform/surveysvc
+   image: eu.gcr.io/ons-rasrmbs-management/survey
    ports:
     - "18080:8080"
    external_links:
@@ -33,7 +33,7 @@ services:
     - security_user_password=secret
  action:
    container_name: action-it
-   image: sdcplatform/actionsvc
+   image: eu.gcr.io/ons-rasrmbs-management/action
    ports:
     - "38151:8151"
    external_links:
@@ -44,9 +44,9 @@ services:
     - spring_datasource_url=jdbc:postgresql://postgres-it:5432/postgres?sslmode=disable
     - spring_datasource_username=postgres
     - spring_datasource_password=postgres
-    - liquibase_url=jdbc:postgresql://postgres-it:5432/postgres?sslmode=disable
-    - liquibase_user=postgres
-    - liquibase_password=postgres
+    - spring_liquibase_url=jdbc:postgresql://postgres-it:5432/postgres?sslmode=disable
+    - spring_liquibase_user=postgres
+    - spring_liquibase_password=postgres
     - security_user_name=admin
     - security_user_password=secret
     - data_grid_address=redis-it:6379
diff --git a/pom.xml b/pom.xml
index 08da3eae..3206f4c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -407,25 +407,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
-                <version>1.4.4</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>build</goal>
-                        </goals>
-                        <phase>package</phase>
-                        <configuration>
-                            <repository>sdcplatform/${project.artifactId}</repository>
-                            <buildArgs>
-                                <JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
-                            </buildArgs>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>com.coveo</groupId>
                 <artifactId>fmt-maven-plugin</artifactId>
@@ -439,58 +420,39 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>io.fabric8</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>0.23.0</version>
+                <groupId>com.dkanejs.maven.plugins</groupId>
+                <artifactId>docker-compose-maven-plugin</artifactId>
+                <version>4.0.0</version>
                 <executions>
                     <execution>
                         <id>pre-stop</id>
+                        <phase>pre-integration-test</phase>
                         <goals>
-                            <goal>stop</goal>
+                            <goal>down</goal>
                         </goals>
-                        <phase>pre-integration-test</phase>
                         <configuration>
-                            <images>
-                                <image>
-                                    <external>
-                                        <type>compose</type>
-                                        <basedir>${project.basedir}</basedir>
-                                    </external>
-                                </image>
-                            </images>
+                            <composeFile>${project.basedir}/docker-compose.yml</composeFile>
                         </configuration>
                     </execution>
                     <execution>
-                        <id>start</id>
+                        <id>up</id>
+                        <phase>pre-integration-test</phase>
                         <goals>
-                            <goal>start</goal>
+                            <goal>up</goal>
                         </goals>
                         <configuration>
-                            <showLogs>false</showLogs>
-                            <images>
-                                <image>
-                                    <external>
-                                        <type>compose</type>
-                                        <basedir>${project.basedir}</basedir>
-                                    </external>
-                                </image>
-                            </images>
+                            <composeFile>${project.basedir}/docker-compose.yml</composeFile>
+                            <detachedMode>true</detachedMode>
                         </configuration>
                     </execution>
                     <execution>
-                        <id>stop</id>
+                        <id>down</id>
+                        <phase>post-integration-test</phase>
                         <goals>
-                            <goal>stop</goal>
+                            <goal>down</goal>
                         </goals>
                         <configuration>
-                            <images>
-                                <image>
-                                    <external>
-                                        <type>compose</type>
-                                        <basedir>${project.basedir}</basedir>
-                                    </external>
-                                </image>
-                            </images>
+                            <composeFile>${project.basedir}/docker-compose.yml</composeFile>
                         </configuration>
                     </execution>
                 </executions>
@@ -509,33 +471,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>se.thinkcode.wait</groupId>
-                <artifactId>http</artifactId>
-                <version>1.1.0</version>
-                <executions>
-                    <execution>
-                        <id>wait-for-action</id>
-                        <goals>
-                            <goal>wait</goal>
-                        </goals>
-                        <configuration>
-                            <url>http://localhost:38151/info</url>
-                            <timeout>60000</timeout>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>wait-for-survey</id>
-                        <goals>
-                            <goal>wait</goal>
-                        </goals>
-                        <configuration>
-                            <url>http://localhost:18080/info</url>
-                            <timeout>60000</timeout>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
         <resources>
             <resource>