diff --git a/.github/workflows/docker_build_dev_on_push_branch_dev.yml b/.github/workflows/docker_build_dev_on_push_branch_dev.yml
new file mode 100644
index 00000000..bb4edab6
--- /dev/null
+++ b/.github/workflows/docker_build_dev_on_push_branch_dev.yml
@@ -0,0 +1,19 @@
+name: Build and push Docker images
+on:
+  push:
+    branches:
+      - dev
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build and push Docker images
+      uses: docker/build-push-action@v1.1.0
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }} # optional
+        password: ${{ secrets.DOCKER_PASSWORD }} # optional
+        repository: ssidk/bifrost-base
+        tags: dev
+        path: components/base # optional, default is .
\ No newline at end of file
diff --git a/.github/workflows/docker_build_latest_on_push_branch_master.yml b/.github/workflows/docker_build_latest_on_push_branch_master.yml
new file mode 100644
index 00000000..bab402c3
--- /dev/null
+++ b/.github/workflows/docker_build_latest_on_push_branch_master.yml
@@ -0,0 +1,19 @@
+name: Build and push Docker images
+on:
+  push:
+    branches:
+      - master
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build and push Docker images
+      uses: docker/build-push-action@v1.1.0
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }} # optional
+        password: ${{ secrets.DOCKER_PASSWORD }} # optional
+        repository: ssidk/bifrost-base
+        tags: latest
+        path: components/base # optional, default is .
\ No newline at end of file
diff --git a/.github/workflows/docker_build_and_push_on_tag.yml b/.github/workflows/docker_build_version_on_release.yml
similarity index 98%
rename from .github/workflows/docker_build_and_push_on_tag.yml
rename to .github/workflows/docker_build_version_on_release.yml
index 33b96e9e..bf77e6fa 100644
--- a/.github/workflows/docker_build_and_push_on_tag.yml
+++ b/.github/workflows/docker_build_version_on_release.yml
@@ -20,7 +20,7 @@ jobs:
         # Docker repository to tag the image with
         repository: ssidk/bifrost-base
         # Comma-delimited list of tags. These will be added to the registry/repository to form the image's tags
-        tags: latest
+        # tags: latest
         # Automatically tags the built image with the git reference as per the readme
         tag_with_ref: true # optional
         # Automatically tags the built image with the git short SHA as per the readme
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
deleted file mode 100644
index eeac5298..00000000
--- a/.github/workflows/main.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: CI
-
-on: [push]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: check-crlf
-      uses: erclu/check-crlf@v1.0
-      with:
-        # Path to check
-        path: . # optional, default is .
diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python_publish_pypi_on_release.yml
similarity index 100%
rename from .github/workflows/python-publish.yml
rename to .github/workflows/python_publish_pypi_on_release.yml
diff --git a/components/ariba_mlst b/components/ariba_mlst
index 34c74bf2..45c32aef 160000
--- a/components/ariba_mlst
+++ b/components/ariba_mlst
@@ -1 +1 @@
-Subproject commit 34c74bf2f165b221a3f29b15e6e6a6d195dcf772
+Subproject commit 45c32aef1b2b4a05c76125307963f7ba1b80833e
diff --git a/components/ariba_plasmidfinder b/components/ariba_plasmidfinder
index a8e0471e..dbb6b443 160000
--- a/components/ariba_plasmidfinder
+++ b/components/ariba_plasmidfinder
@@ -1 +1 @@
-Subproject commit a8e0471e9d229a57b8178d623d27fb033f98f1c6
+Subproject commit dbb6b44318af40fa43924568efca20ccbd2a65be
diff --git a/components/ariba_resfinder b/components/ariba_resfinder
index 89eff774..49da62de 160000
--- a/components/ariba_resfinder
+++ b/components/ariba_resfinder
@@ -1 +1 @@
-Subproject commit 89eff7749be796b7c76b28b99711b94a1e1e3648
+Subproject commit 49da62de2ad076230299b47068ee61492d3149fd
diff --git a/components/ariba_virulencefinder b/components/ariba_virulencefinder
index aaf6dfa4..5d8e574e 160000
--- a/components/ariba_virulencefinder
+++ b/components/ariba_virulencefinder
@@ -1 +1 @@
-Subproject commit aaf6dfa4a4e3bcf452a1ae0cf00f6adbaf88e45d
+Subproject commit 5d8e574ea1951c10e9187315d3d5b04472a392c7
diff --git a/components/assemblatron b/components/assemblatron
index 1b1776ae..6f8a085f 160000
--- a/components/assemblatron
+++ b/components/assemblatron
@@ -1 +1 @@
-Subproject commit 1b1776aefc356b68801ccde9102771579ed4d38b
+Subproject commit 6f8a085f8109a967e26358501113807bfee597e3
diff --git a/components/cge_mlst b/components/cge_mlst
index 1a4575f9..0593d155 160000
--- a/components/cge_mlst
+++ b/components/cge_mlst
@@ -1 +1 @@
-Subproject commit 1a4575f994cb81dba7d5769f29e623d36cb8c290
+Subproject commit 0593d1555bf0718c784c4a15bf99df85a16ef2d1
diff --git a/components/cge_resfinder b/components/cge_resfinder
index e04bae31..bbf18629 160000
--- a/components/cge_resfinder
+++ b/components/cge_resfinder
@@ -1 +1 @@
-Subproject commit e04bae31c7811649bb7513b1eb29611379693017
+Subproject commit bbf18629ba7d1c84b667d97fbcb0e356665ff707
diff --git a/components/min_read_check b/components/min_read_check
index 2e098e96..72ed96f5 160000
--- a/components/min_read_check
+++ b/components/min_read_check
@@ -1 +1 @@
-Subproject commit 2e098e96001e1382f84c72909eb017ba05a5560a
+Subproject commit 72ed96f5119de301ecb003f375a8318d0697e1b0
diff --git a/components/ssi_stamper b/components/ssi_stamper
index 2be1d79e..b1441eca 160000
--- a/components/ssi_stamper
+++ b/components/ssi_stamper
@@ -1 +1 @@
-Subproject commit 2be1d79e0f597c82e3330d702a71cf7f56ce39fd
+Subproject commit b1441eca76c036600c3cbea005d85218bb7342bb
diff --git a/components/whats_my_species b/components/whats_my_species
index 25bfd99d..0cc60df2 160000
--- a/components/whats_my_species
+++ b/components/whats_my_species
@@ -1 +1 @@
-Subproject commit 25bfd99d27b8c7d3fe0fb64aab3a80b9657205c6
+Subproject commit 0cc60df2279ac2a2142eed40425c6602d615a604