diff --git a/docker-compose.yml b/docker-compose.yml
index 46b8d34..2781090 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,57 +1,60 @@
 ---
+x-linting-common: &linting-common
+  environment:
+    - RUN_LOCAL=true
+    - USE_FIND_ALGORITHM=true
+    - VALIDATE_ALL_CODEBASE=true
+    - FILTER_REGEX_EXCLUDE=.*/\.mypy_cache/.*
+x-ci-common: &testing-common
+  command: ["/bin/bash", "-c", ". run-ci"]
+  env_file:
+    - environments/testing.env
 services:
   testing:
+    <<: *testing-common
     build:
       context: .
       target: testing
-      dockerfile: Dockerfile
       args:
         - USERNAME=eci-user
-    command: ["sh", "-c", "./run-ci"]
-    env_file:
-      - environments/testing.env
     volumes:
       - type: bind
-        source: ~/awk-src
-        target: /awk-src
+        source: ~/md-src/workflow-templates
+        target: /workflow-templates
         read_only: false
     profiles:
       - testing
-
-
+  ci-testing:
+    <<: *testing-common
+    build:
+      context: .
+      target: ci-testing
+      args:
+        - USERNAME=eci-user
+    profiles:
+      - ci-testing
   linting:
     image: github/super-linter:v5
+    <<: *linting-common
     volumes:
-      - ~/awk-src:/tmp/lint
-    env_file:
-      - environments/linter.env
-    environment:
-      - RUN_LOCAL=true
-      - USE_FIND_ALGORITHM=true
-      - VALIDATE_ALL_CODEBASE=true
+      - ~/md-src/workflow-templates:/tmp/lint
     profiles:
       - linting
-
-  continuous-integration:
+  ci-linting:
     build:
       context: .
-      target: continuous-integration
-      dockerfile: Dockerfile
+      target: ci-linting
       args:
         - USERNAME=eci-user
-    command: ["sh", "-c", "sudo ./run-ci"]
-    env_file:
-      - environments/testing.env
+    <<: *linting-common
     profiles:
-      - continuous-integration
-
+      - ci-linting
   developing:
     build:
       context: .
-      dockerfile: Dockerfile
       args:
         - USERNAME=${USER}
-    command: ["sh", "-c", ". /tmp/install &&  nohup /tmp/.sleeping_daemon"]
+    command: ["/bin/bash", "-c", ". /tmp/install &&  nohup /tmp/.sleeping_daemon"]
     env_file:
       - environments/development.env
     volumes:
@@ -60,8 +63,8 @@ services:
         target: /home/${USER}/.ssh
         read_only: true
       - type: bind
-        source: ~/awk-src
-        target: /home/${USER}/awk-src
+        source: ~/md-src/workflow-templates
+        target: /home/${USER}/workflow-templates
         read_only: false
     profiles:
       - developing
\ No newline at end of file