diff --git a/.github/workflows/buildContainer.yaml b/.github/workflows/buildContainer.yaml
index 737c167..5e7b5fd 100644
--- a/.github/workflows/buildContainer.yaml
+++ b/.github/workflows/buildContainer.yaml
@@ -49,9 +49,9 @@ jobs:
         run: |
           VERSION=$(head -n 1 Images/${{ matrix.container }}/${{ matrix.container }}.dockerfile | cut -d ":" -f 2- | tr -d " ")
           echo "IMAGE_TAG=$VERSION" >> $GITHUB_ENV
-          cp Images/${{ matrix.container }}/start_${{ matrix.container }}.sh Images/test_plugin.sh Images/nginx/nginx_qiita.conf Images/${{ matrix.container }}/requirements.txt .
+          cp Images/start_plugin.sh Images/test_plugin.sh Images/nginx/nginx_qiita.conf Images/${{ matrix.container }}/requirements.txt Images/nginx/start_nginx.sh .
           cp Images/qiita/config_portal.cfg Images/qiita/config_qiita_oidc.cfg Images/qiita/drop_workflows.py Images/qiita/start_plugin.py Images/qiita/start_qiita-initDB.sh Images/qiita/start_qiita.sh .
-          cp Images/plugin_collector/collect_configs.py Images/plugin_collector/fix_test_db.py Images/plugin_collector/stefan_cert.conf Images/plugin_collector/stefan_csr.conf .
+          cp Images/plugin_collector/collect_configs.py Images/plugin_collector/fix_test_db.py Images/plugin_collector/stefan_cert.conf Images/plugin_collector/stefan_csr.conf Images/plugin_collector/start_plugin_collector.sh .
 
       - name: Download certificates from job build_main
         uses: actions/download-artifact@v4
@@ -118,7 +118,7 @@ jobs:
         run: |
           VERSION=$(head -n 1 Images/${{ matrix.plugin }}/${{ matrix.plugin }}.dockerfile | cut -d ":" -f 2- | tr -d " ")
           echo "IMAGE_TAG=$VERSION" >> $GITHUB_ENV
-          cp Images/${{ matrix.plugin }}/start_${{ matrix.plugin }}.sh Images/test_plugin.sh Images/${{ matrix.plugin }}/requirements.txt Images/trigger_noconda.py Images/trigger.py .
+          cp Images/start_plugin.sh Images/test_plugin.sh Images/${{ matrix.plugin }}/requirements.txt Images/trigger_noconda.py Images/trigger.py .
 
       - name: Download certificates from job build_main
         uses: actions/download-artifact@v4
@@ -193,7 +193,7 @@ jobs:
         run: |
           VERSION=$(head -n 1 Images/${{ matrix.multiplugin }}/${{ matrix.multiplugin }}.dockerfile | cut -d ":" -f 2- | tr -d " ")
           echo "IMAGE_TAG=$VERSION" >> $GITHUB_ENV
-          cp Images/${{ matrix.multiplugin }}/start_${{ matrix.multiplugin }}.sh Images/test_plugin.sh Images/${{ matrix.multiplugin }}/requirements.txt Images/trigger_noconda.py Images/trigger.py .
+          cp Images/start_plugin.sh Images/test_plugin.sh Images/${{ matrix.multiplugin }}/requirements.txt Images/trigger_noconda.py Images/trigger.py .
 
       - name: Download certificates from job build_main
         uses: actions/download-artifact@v4
@@ -223,6 +223,12 @@ jobs:
           cache-from: type=gha,scope=tinqiita-${{ github.ref_name }}
           cache-to: type=gha,scope=tinqiita-${{ github.ref_name }},mode=max
 
+      - name: Prune build cache after build (saving disc space)
+        run: |
+          df -h /
+          docker buildx prune -af
+          df -h /
+
       - name: adapt compose file to select specific plugin
         run: |
           if [[ "${{ matrix.multiplugin }}" == "qp-qiime2" ]]; then sed -i 's|- QIITA_PLUGINS="MATRIXPLUGIN:"|- QIITA_PLUGINS="${{ matrix.multiplugin }}:qtp-diversity:qtp-visualization:"|' compose_github.yaml; sed -i 's|MATRIXPLUGIN:|${{ matrix.multiplugin }}:\n        condition: service_started\n      qtp-diversity:\n        condition: service_started\n      qtp-visualization:|' compose_github.yaml; fi;
@@ -241,12 +247,8 @@ jobs:
 
       - name: Push image to ghcr (only if tests passed)
         if: success()
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          push: true
-          file: Images/${{ matrix.multiplugin }}/${{ matrix.multiplugin }}.dockerfile
-          tags: ghcr.io/${{ github.repository }}/${{ matrix.multiplugin }}:testcandidate
+        run: |
+          docker push ghcr.io/${{ github.repository }}/${{ matrix.multiplugin }}:testcandidate
 
   publish_images:
     needs:
diff --git a/Images/qp-deblur/qp-deblur.dockerfile b/Images/qp-deblur/qp-deblur.dockerfile
index 067fe51..03f4457 100644
--- a/Images/qp-deblur/qp-deblur.dockerfile
+++ b/Images/qp-deblur/qp-deblur.dockerfile
@@ -110,8 +110,8 @@ COPY trigger_noconda.py /trigger.py
 
 WORKDIR /
 
-COPY start_qp-deblur.sh .
-RUN chmod 755 start_qp-deblur.sh
+COPY start_plugin.sh .
+RUN chmod 755 start_plugin.sh
 
 RUN mkdir -p /unshared_plugins
 ENV QIITA_PLUGINS_DIR=/unshared_plugins/
@@ -139,5 +139,5 @@ RUN sed -i "s|source /opt/conda/etc/profile.d/conda.sh; conda activate /opt/cond
 # for testing
 COPY test_plugin.sh /test_plugin.sh
 
-CMD ["./start_qp-deblur.sh"]
+CMD ["./start_plugin.sh"]
 # ^^ 848 MB
\ No newline at end of file
diff --git a/Images/qp-deblur/start_qp-deblur.sh b/Images/qp-deblur/start_qp-deblur.sh
deleted file mode 100644
index b2a90c6..0000000
--- a/Images/qp-deblur/start_qp-deblur.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-cd / && python trigger.py start_deblur
-
-tail -f /dev/null
diff --git a/Images/qp-qiime2/qp-qiime2.dockerfile b/Images/qp-qiime2/qp-qiime2.dockerfile
index 629e40c..fe0e959 100644
--- a/Images/qp-qiime2/qp-qiime2.dockerfile
+++ b/Images/qp-qiime2/qp-qiime2.dockerfile
@@ -86,8 +86,8 @@ RUN dpkg-reconfigure -f noninteractive tzdata
 
 WORKDIR /
 
-COPY start_qp-qiime2.sh .
-RUN chmod 755 start_qp-qiime2.sh
+COPY start_plugin.sh .
+RUN chmod 755 start_plugin.sh
 
 RUN mkdir -p /unshared_plugins
 ENV QIITA_PLUGINS_DIR=/unshared_plugins/
@@ -108,4 +108,4 @@ RUN sed -i -E "s/^START_SCRIPT = .+/START_SCRIPT = python \/start_plugin.py qp-q
 # for testing
 COPY test_plugin.sh /test_plugin.sh
 
-CMD ["./start_qp-qiime2.sh"]
+CMD ["./start_plugin.sh"]
diff --git a/Images/qp-qiime2/start_qp-qiime2.sh b/Images/qp-qiime2/start_qp-qiime2.sh
deleted file mode 100644
index 50069a0..0000000
--- a/Images/qp-qiime2/start_qp-qiime2.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-cd / && python trigger.py qiime2 start_qiime2 /qp-qiime2
-
-tail -f /dev/null
diff --git a/Images/qp-target-gene/qp-target-gene.dockerfile b/Images/qp-target-gene/qp-target-gene.dockerfile
index dc3b9f7..ee63518 100644
--- a/Images/qp-target-gene/qp-target-gene.dockerfile
+++ b/Images/qp-target-gene/qp-target-gene.dockerfile
@@ -105,8 +105,8 @@ COPY --from=builder /opt/conda/envs/qp-target-gene/lib/libpython2.7.so.1.0 /usr/
 # "install" pigz
 COPY --from=builder /opt/conda/envs/qp-target-gene/bin/pigz /usr/local/bin/
 
-COPY start_qp-target-gene.sh .
-RUN chmod 755 start_qp-target-gene.sh
+COPY start_plugin.sh .
+RUN chmod 755 start_plugin.sh
 
 RUN mkdir -p /unshared_plugins
 ENV QIITA_PLUGINS_DIR=/unshared_plugins/
@@ -133,4 +133,4 @@ RUN sed -i -E "s/^START_SCRIPT = .+/START_SCRIPT = python \/start_plugin.py qp-t
 # for testing
 COPY test_plugin.sh /test_plugin.sh
 
-CMD ["./start_qp-target-gene.sh"]
+CMD ["./start_plugin.sh"]
diff --git a/Images/qp-target-gene/start_qp-target-gene.sh b/Images/qp-target-gene/start_qp-target-gene.sh
deleted file mode 100644
index cf92cee..0000000
--- a/Images/qp-target-gene/start_qp-target-gene.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-cd / && python3 trigger.py start_target_gene
-
-tail -f /dev/null
diff --git a/Images/qtp-biom/qtp-biom.dockerfile b/Images/qtp-biom/qtp-biom.dockerfile
index 98d4841..435c202 100644
--- a/Images/qtp-biom/qtp-biom.dockerfile
+++ b/Images/qtp-biom/qtp-biom.dockerfile
@@ -113,7 +113,7 @@ RUN conda install cython
 RUN pip wheel --no-cache-dir --wheel-dir /wheels -r requirements.txt
 RUN pip install iow
 
-CMD ["./start_qtp-biom.sh"]
+CMD ["./start_plugin.sh"]
 
 # ==========================
 # Stage 2: Runtime
@@ -139,8 +139,8 @@ COPY trigger_noconda.py /trigger.py
 
 WORKDIR /
 
-COPY start_qtp-biom.sh .
-RUN chmod 755 start_qtp-biom.sh
+COPY start_plugin.sh .
+RUN chmod 755 start_plugin.sh
 
 RUN mkdir -p /unshared_plugins
 ENV QIITA_PLUGINS_DIR=/unshared_plugins/
@@ -173,6 +173,6 @@ RUN sed -i "s/'display.max_colwidth', -1/'display.max_colwidth', None/" /usr/loc
 # for testing
 COPY test_plugin.sh /test_plugin.sh
 
-CMD ["./start_qtp-biom.sh"]
+CMD ["./start_plugin.sh"]
 
 # python -c "import qiime2.plugins.feature_table"
\ No newline at end of file
diff --git a/Images/qtp-biom/start_qtp-biom.sh b/Images/qtp-biom/start_qtp-biom.sh
deleted file mode 100644
index dc62c7e..0000000
--- a/Images/qtp-biom/start_qtp-biom.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-cd / && python trigger.py start_biom
-
-tail -f /dev/null
diff --git a/Images/qtp-diversity/qtp-diversity.dockerfile b/Images/qtp-diversity/qtp-diversity.dockerfile
index f7d79cc..97a81e9 100644
--- a/Images/qtp-diversity/qtp-diversity.dockerfile
+++ b/Images/qtp-diversity/qtp-diversity.dockerfile
@@ -112,8 +112,8 @@ COPY --from=builder /wheels /wheels
 RUN pip install --no-cache-dir /wheels/* \
 	&& rm -rf rm -rf `find /usr/local/lib/python3.8/site-packages -type d -name "tests" | grep -v numpy`
 
-COPY start_qtp-diversity.sh .
-RUN chmod 755 start_qtp-diversity.sh
+COPY start_plugin.sh .
+RUN chmod 755 start_plugin.sh
 
 RUN mkdir -p /unshared_plugins
 ENV QIITA_PLUGINS_DIR=/unshared_plugins/
@@ -144,11 +144,11 @@ COPY --from=builder /opt/conda/envs/qiime2/lib/libhdf5_cpp.so.103.2.0    /usr/lo
 COPY --from=builder /opt/conda/envs/qiime2/lib/libhdf5_hl_cpp.so.100.1.4 /usr/local/lib/libhdf5_hl_cpp.so.100
 COPY --from=builder /opt/conda/envs/qiime2/lib/libhdf5_hl.so.100.1.3     /usr/local/lib/libhdf5_hl.so.100
 COPY --from=builder /opt/conda/envs/qiime2/lib/libhdf5.so.103.2.0        /usr/local/lib/libhdf5.so.103
-COPY --from=builder /opt/conda/envs/qiime2/lib/libcrypto.so.1.1          /usr/local/lib/libcrypto.so.1.1
+COPY --from=builder /opt/conda/envs/qiime2/lib/libcrypto.so*             /usr/local/lib/
 COPY --from=builder /opt/conda/envs/qiime2/lib/libcurl.so.4.8.0          /usr/local/lib/libcurl.so.4
-COPY --from=builder /opt/conda/envs/qiime2/lib/libnghttp2.so.14.24.1     /usr/local/lib/libnghttp2.so.14
+COPY --from=builder /opt/conda/envs/qiime2/lib/libnghttp2.so.*           /usr/local/lib/
 COPY --from=builder /opt/conda/envs/qiime2/lib/libssh2.so.1.0.1          /usr/local/lib/libssh2.so.1
-COPY --from=builder /opt/conda/envs/qiime2/lib/libssl.so.1.1             /usr/local/lib/libssl.so.1.1
+COPY --from=builder /opt/conda/envs/qiime2/lib/libssl.so*                /usr/local/lib/
 RUN ln -s /usr/local/lib/libopenblasp-r0.3.25.so /usr/local/lib/libcblas.so.3
 RUN ln -s /usr/local/lib/libopenblasp-r0.3.25.so /usr/local/lib/liblapacke.so.3
 RUN for f in `echo "libssu.so libhdf5_cpp.so.103 liblapacke.so.3 libcblas.so.3 libhdf5_hl_cpp.so.100 libhdf5_hl.so.100 libhdf5.so.103 libcrypto.so.1.1 libcurl.so.4 libgfortran.so.5 libnghttp2.so.14 libssh2.so.1 libssl.so.1.1 libquadmath.so.0"`; do ln -s /usr/local/lib/$f /lib/x86_64-linux-gnu/$f; done
@@ -180,4 +180,4 @@ RUN sed -i -E "s/^START_SCRIPT = .+/START_SCRIPT = python \/start_plugin.py qtp-
 # for testing
 COPY test_plugin.sh /test_plugin.sh
 
-CMD ["./start_qtp-diversity.sh"]
+CMD ["./start_plugin.sh"]
diff --git a/Images/qtp-diversity/start_qtp-diversity.sh b/Images/qtp-diversity/start_qtp-diversity.sh
deleted file mode 100644
index 0396871..0000000
--- a/Images/qtp-diversity/start_qtp-diversity.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-cd / && python trigger.py start_diversity_types
-
-tail -f /dev/null
diff --git a/Images/qtp-job-output-folder/qtp-job-output-folder.dockerfile b/Images/qtp-job-output-folder/qtp-job-output-folder.dockerfile
index 3ea824a..ea37fa0 100644
--- a/Images/qtp-job-output-folder/qtp-job-output-folder.dockerfile
+++ b/Images/qtp-job-output-folder/qtp-job-output-folder.dockerfile
@@ -76,8 +76,8 @@ RUN pip install --no-cache-dir /wheels/* \
 
 COPY trigger_noconda.py /trigger.py
 
-COPY start_qtp-job-output-folder.sh .
-RUN chmod 755 start_qtp-job-output-folder.sh
+COPY start_plugin.sh .
+RUN chmod 755 start_plugin.sh
 
 RUN mkdir -p /unshared_plugins
 ENV QIITA_PLUGINS_DIR=/unshared_plugins/
@@ -96,4 +96,4 @@ RUN sed -i -E "s/^START_SCRIPT = .+/START_SCRIPT = python \/start_plugin.py qtp-
 # for testing
 COPY test_plugin.sh /test_plugin.sh
 
-CMD ["./start_qtp-job-output-folder.sh"]
+CMD ["./start_plugin.sh"]
diff --git a/Images/qtp-job-output-folder/start_qtp-job-output-folder.sh b/Images/qtp-job-output-folder/start_qtp-job-output-folder.sh
deleted file mode 100644
index d3097cb..0000000
--- a/Images/qtp-job-output-folder/start_qtp-job-output-folder.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-cd / && python trigger.py start_qtp_job_output_folder
-
-tail -f /dev/null
diff --git a/Images/qtp-sequencing/qtp-sequencing.dockerfile b/Images/qtp-sequencing/qtp-sequencing.dockerfile
index 20cbd1d..367ef73 100644
--- a/Images/qtp-sequencing/qtp-sequencing.dockerfile
+++ b/Images/qtp-sequencing/qtp-sequencing.dockerfile
@@ -85,8 +85,8 @@ RUN ln -s /usr/local/bin/quast.py /usr/local/bin/quast
 
 # WORKDIR /
 
-COPY start_qtp-sequencing.sh .
-RUN chmod 755 start_qtp-sequencing.sh
+COPY start_plugin.sh .
+RUN chmod 755 start_plugin.sh
 
 RUN mkdir -p /unshared_plugins
 ENV QIITA_PLUGINS_DIR=/unshared_plugins/
@@ -112,4 +112,4 @@ RUN mkdir -p /usr/share/man/man1 && \
 # for testing
 COPY test_plugin.sh /test_plugin.sh
 
-CMD ["./start_qtp-sequencing.sh"]
\ No newline at end of file
+CMD ["./start_plugin.sh"]
\ No newline at end of file
diff --git a/Images/qtp-sequencing/start_qtp-sequencing.sh b/Images/qtp-sequencing/start_qtp-sequencing.sh
deleted file mode 100644
index d9ab477..0000000
--- a/Images/qtp-sequencing/start_qtp-sequencing.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-cd / && python trigger.py start_qtp_sequencing
-
-tail -f /dev/null
diff --git a/Images/qtp-visualization/qtp-visualization.dockerfile b/Images/qtp-visualization/qtp-visualization.dockerfile
index e08ad3e..01a5976 100644
--- a/Images/qtp-visualization/qtp-visualization.dockerfile
+++ b/Images/qtp-visualization/qtp-visualization.dockerfile
@@ -96,8 +96,8 @@ COPY --from=builder /wheels /wheels
 RUN pip install --no-cache-dir /wheels/* \
 	&& rm -rf rm -rf `find /usr/local/lib/python3.8/site-packages -type d -name "tests" | grep -v numpy`
 
-COPY start_qtp-visualization.sh .
-RUN chmod 755 start_qtp-visualization.sh
+COPY start_plugin.sh .
+RUN chmod 755 start_plugin.sh
 
 RUN mkdir -p /unshared_plugins
 ENV QIITA_PLUGINS_DIR=/unshared_plugins/
@@ -119,4 +119,4 @@ RUN sed -i -E "s/^START_SCRIPT = .+/START_SCRIPT = python \/start_plugin.py qtp-
 # for testing
 COPY test_plugin.sh /test_plugin.sh
 
-CMD ["./start_qtp-visualization.sh"]
\ No newline at end of file
+CMD ["./start_plugin.sh"]
\ No newline at end of file
diff --git a/Images/qtp-visualization/start_qtp-visualization.sh b/Images/qtp-visualization/start_qtp-visualization.sh
deleted file mode 100644
index e5a4c14..0000000
--- a/Images/qtp-visualization/start_qtp-visualization.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-cd / && python trigger.py start_visualization_types
-
-tail -f /dev/null
diff --git a/Images/start_plugin.sh b/Images/start_plugin.sh
new file mode 100755
index 0000000..2faad61
--- /dev/null
+++ b/Images/start_plugin.sh
@@ -0,0 +1,62 @@
+#!/bin/bash
+
+# proper listening and reacting to SIGTERM
+cleanup() {
+    echo "Received SIGTERM, stopping..."
+    kill "$PY_PID" 2>/dev/null
+    wait "$PY_PID"
+    exit 0
+}
+trap cleanup SIGTERM SIGINT
+
+STARTSCRIPT=
+if [ -z "$PLUGIN" ]; then
+    echo "Environment variable PLUGIN is empty. It should habe been set during the docker build process. Double check your dockerfile!"
+    exit 1
+fi
+case "$PLUGIN" in
+    qp-deblur)
+        STARTSCRIPT=start_deblur
+        ;;
+    qp-qiime2)
+        STARTSCRIPT=start_qiime2
+        ;;
+    qp-target-gene)
+        STARTSCRIPT=start_target_gene
+        ;;
+    qtp-biom)
+        STARTSCRIPT=start_biom
+        ;;
+    qtp-diversity)
+        STARTSCRIPT=start_diversity_types
+        ;;
+    qtp-job-output-folder)
+        STARTSCRIPT=start_qtp_job_output_folder
+        ;;
+    qtp-sequencing)
+        STARTSCRIPT=start_qtp_sequencing
+        ;;
+    qtp-visualization)
+        STARTSCRIPT=start_visualization_types
+        ;;
+    *)
+        echo "unknown qiita plugin $PLUGIN"
+        exit 1
+        ;;
+esac
+    
+# start tornado server and safe PID in variable
+cd /
+if [ "$PLUGIN" = "qp-qiime2" ]; then
+    # as this plugin still uses a conda environment
+    python trigger.py qiime2 $STARTSCRIPT /qp-qiime2 &
+elif [ "$PLUGIN" = "qp-target-gene" ]; then
+    # as this plugin uses old py27
+    python3 trigger.py $STARTSCRIPT &
+else
+    python trigger.py $STARTSCRIPT &
+fi
+PY_PID=$!
+
+# wait till trigger.py process is terminated
+wait "$PY_PID"
diff --git a/Makefile b/Makefile
index 37eb050..cf1ed15 100644
--- a/Makefile
+++ b/Makefile
@@ -31,17 +31,17 @@ $(DIR_REFERENCES)/qiita_server_certificates: Images/plugin_collector/stefan_csr.
 	# === end: create own certificates ===
 
 # a general target, executed for each plugin
-plugin: Images/trigger.py Images/trigger_noconda.py $(DIR_REFERENCES)/qiita_server_certificates Images/test_plugin.sh 
+plugin: Images/trigger.py Images/trigger_noconda.py Images/start_plugin.sh $(DIR_REFERENCES)/qiita_server_certificates Images/test_plugin.sh
 	cp -r $^ $(tmpdir)/
 
-.built_image_qtp-biom: Images/qtp-biom/qtp-biom.dockerfile Images/qtp-biom/start_qtp-biom.sh src/qiita-files/ src/qtp-biom/ Images/qtp-biom/requirements.txt
+.built_image_qtp-biom: Images/qtp-biom/qtp-biom.dockerfile src/qiita-files/ src/qtp-biom/ Images/qtp-biom/requirements.txt
 	test -d src/qtp-biom || git clone https://github.com/qiita-spots/qtp-biom.git src/qtp-biom
 	tmpdir=$(TMPDIR) $(MAKE) plugin
 	cp -r $^ $(TMPDIR)
 	$(PODMAN_BIN) build $(TMPDIR)/ -f $(TMPDIR)/`basename $<` $(PODMAN_FLAGS) -t local-`basename $< | cut -d "." -f 1`
 	touch .built_image_`basename $< | cut -d "." -f 1`
 
-.built_image_qtp-sequencing: Images/qtp-sequencing/qtp-sequencing.dockerfile Images/qtp-sequencing/start_qtp-sequencing.sh Images/qtp-sequencing/requirements.txt
+.built_image_qtp-sequencing: Images/qtp-sequencing/qtp-sequencing.dockerfile Images/qtp-sequencing/requirements.txt
 	tmpdir=$(TMPDIR) $(MAKE) plugin
 	cp $^ $(TMPDIR)
 	$(PODMAN_BIN) build $(TMPDIR)/ -f $(TMPDIR)/`basename $<` $(PODMAN_FLAGS) -t local-`basename $< | cut -d "." -f 1`
@@ -58,19 +58,19 @@ $(DIR_REFERENCES)/qp-target-gene:
 	wget 'ftp://ftp.microbio.me/greengenes_release/gg_13_8_otus/rep_set/97_otus.fasta' -O $(DIR_REFERENCES)/qp-target-gene/97_otus.fasta
 	cd $(DIR_REFERENCES)/qp-target-gene/ && md5sum -c exp.md5 || rm -rf $(DIR_REFERENCES)/qp-target-gene/
 
-.built_image_qp-target-gene: Images/qp-target-gene/qp-target-gene.dockerfile Images/qp-target-gene/start_qp-target-gene.sh $(DIR_REFERENCES)/qp-target-gene Images/qp-target-gene/requirements.txt
+.built_image_qp-target-gene: Images/qp-target-gene/qp-target-gene.dockerfile $(DIR_REFERENCES)/qp-target-gene Images/qp-target-gene/requirements.txt
 	tmpdir=$(TMPDIR) $(MAKE) plugin
 	cp -r $^ $(TMPDIR)
 	$(PODMAN_BIN) build $(TMPDIR)/ -f $(TMPDIR)/`basename $<` $(PODMAN_FLAGS) -t local-`basename $< | cut -d "." -f 1`
 	touch .built_image_`basename $< | cut -d "." -f 1`
 
-.built_image_qtp-visualization: Images/qtp-visualization/qtp-visualization.dockerfile Images/qtp-visualization/start_qtp-visualization.sh Images/qtp-visualization/requirements.txt
+.built_image_qtp-visualization: Images/qtp-visualization/qtp-visualization.dockerfile Images/qtp-visualization/requirements.txt
 	tmpdir=$(TMPDIR) $(MAKE) plugin
 	cp $^ $(TMPDIR)
 	$(PODMAN_BIN) build $(TMPDIR)/ -f $(TMPDIR)/`basename $<` $(PODMAN_FLAGS) -t local-`basename $< | cut -d "." -f 1`
 	touch .built_image_`basename $< | cut -d "." -f 1`
 
-.built_image_qtp-diversity: Images/qtp-diversity/qtp-diversity.dockerfile Images/qtp-diversity/start_qtp-diversity.sh Images/qtp-diversity/requirements.txt
+.built_image_qtp-diversity: Images/qtp-diversity/qtp-diversity.dockerfile Images/qtp-diversity/requirements.txt
 	tmpdir=$(TMPDIR) $(MAKE) plugin
 	cp $^ $(TMPDIR)
 	$(PODMAN_BIN) build $(TMPDIR)/ -f $(TMPDIR)/`basename $<` $(PODMAN_FLAGS) -t local-`basename $< | cut -d "." -f 1`
@@ -84,19 +84,19 @@ $(DIR_REFERENCES)/qp-deblur/reference-gg-raxml-bl.tre:
 	cp $(DIR_REFERENCES)/tmp_sepp/share/fragment-insertion/ref/* $(DIR_REFERENCES)/qp-deblur/
 	rm -rf $(DIR_REFERENCES)/tmp_sepp/
 
-.built_image_qp-deblur: Images/qp-deblur/qp-deblur.dockerfile Images/qp-deblur/start_qp-deblur.sh $(DIR_REFERENCES)/qp-deblur/reference-gg-raxml-bl.tre Images/qp-deblur/requirements.txt
+.built_image_qp-deblur: Images/qp-deblur/qp-deblur.dockerfile $(DIR_REFERENCES)/qp-deblur/reference-gg-raxml-bl.tre Images/qp-deblur/requirements.txt
 	tmpdir=$(TMPDIR) $(MAKE) plugin
 	cp $^ $(TMPDIR)
 	$(PODMAN_BIN) build $(TMPDIR)/ -f $(TMPDIR)/`basename $<` $(PODMAN_FLAGS) -t local-`basename $< | cut -d "." -f 1`
 	touch .built_image_`basename $< | cut -d "." -f 1`
 
-.built_image_qp-qiime2: Images/qp-qiime2/qp-qiime2.dockerfile Images/qp-qiime2/start_qp-qiime2.sh
+.built_image_qp-qiime2: Images/qp-qiime2/qp-qiime2.dockerfile
 	tmpdir=$(TMPDIR) $(MAKE) plugin
 	cp $^ $(TMPDIR)
 	$(PODMAN_BIN) build $(TMPDIR)/ -f $(TMPDIR)/`basename $<` $(PODMAN_FLAGS) -t local-`basename $< | cut -d "." -f 1`
 	touch .built_image_`basename $< | cut -d "." -f 1`
 
-.built_image_qtp-job-output-folder: Images/qtp-job-output-folder/qtp-job-output-folder.dockerfile Images/qtp-job-output-folder/start_qtp-job-output-folder.sh Images/qtp-job-output-folder/requirements.txt
+.built_image_qtp-job-output-folder: Images/qtp-job-output-folder/qtp-job-output-folder.dockerfile Images/qtp-job-output-folder/requirements.txt
 	tmpdir=$(TMPDIR) $(MAKE) plugin
 	cp $^ $(TMPDIR)
 	$(PODMAN_BIN) build $(TMPDIR)/ -f $(TMPDIR)/`basename $<` $(PODMAN_FLAGS) -t local-`basename $< | cut -d "." -f 1`
diff --git a/compose.yaml b/compose.yaml
index 53a4b4d..e7ee21b 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -193,10 +193,6 @@ services:
 
   qtp-biom:
     image: local-qtp-biom:latest
-    command: ['./start_qtp-biom.sh']
-    # network_mode: host
-    # stdin_open: true
-    # tty: true
     restart: no
     volumes:
       - qiita-data:/qiita_data
@@ -210,10 +206,6 @@ services:
 
   qtp-sequencing:
     image: local-qtp-sequencing:latest
-    command: ['./start_qtp-sequencing.sh']
-    # network_mode: host
-    # stdin_open: true
-    # tty: true
     restart: no
     volumes:
       - qiita-data:/qiita_data
@@ -226,10 +218,6 @@ services:
 
   qp-target-gene:
     image: local-qp-target-gene:latest
-    command: ['./start_qp-target-gene.sh']
-    # network_mode: host
-    # stdin_open: true
-    # tty: true
     restart: no
     volumes:
       - qiita-data:/qiita_data
@@ -243,10 +231,6 @@ services:
 
   qtp-visualization:
     image: local-qtp-visualization:latest
-    command: ['./start_qtp-visualization.sh']
-    # network_mode: host
-    # stdin_open: true
-    # tty: true
     restart: no
     volumes:
       - qiita-data:/qiita_data
@@ -259,10 +243,6 @@ services:
 
   qtp-diversity:
     image: local-qtp-diversity:latest
-    command: ['./start_qtp-diversity.sh']
-    # network_mode: host
-    # stdin_open: true
-    # tty: true
     restart: no
     volumes:
       - qiita-data:/qiita_data
@@ -275,10 +255,6 @@ services:
 
   qp-deblur:
     image: local-qp-deblur:latest
-    command: ['./start_qp-deblur.sh']
-    # network_mode: host
-    # stdin_open: true
-    # tty: true
     restart: no
     volumes:
       - qiita-data:/qiita_data
@@ -293,10 +269,6 @@ services:
 
   qp-qiime2:
     image: local-qp-qiime2:latest
-    command: ['./start_qp-qiime2.sh']
-    # network_mode: host
-    # stdin_open: true
-    # tty: true
     restart: no
     volumes:
       - qiita-data:/qiita_data
@@ -310,10 +282,6 @@ services:
 
   qtp-job-output-folder:
     image: local-qtp-job-output-folder:latest
-    command: ['./start_qtp-job-output-folder.sh']
-    # network_mode: host
-    # stdin_open: true
-    # tty: true
     restart: no
     volumes:
       - qiita-data:/qiita_data
diff --git a/compose_github.yaml b/compose_github.yaml
index 443a6f9..e936ecd 100644
--- a/compose_github.yaml
+++ b/compose_github.yaml
@@ -171,10 +171,6 @@ services:
 
   qtp-biom:
     image: ghcr.io/jlab/qiita-keycloak/qtp-biom:testcandidate
-    command: ['./start_qtp-biom.sh']
-    # network_mode: host
-    # stdin_open: true
-    # tty: true
     restart: no
     volumes:
       - qiita-data:/qiita_data
@@ -187,10 +183,6 @@ services:
 
   qtp-sequencing:
     image: ghcr.io/jlab/qiita-keycloak/qtp-sequencing:testcandidate
-    command: ['./start_qtp-sequencing.sh']
-    # network_mode: host
-    # stdin_open: true
-    # tty: true
     restart: no
     volumes:
       - qiita-data:/qiita_data
@@ -209,10 +201,6 @@ services:
 
   qp-target-gene:
     image: ghcr.io/jlab/qiita-keycloak/qp-target-gene:testcandidate
-    command: ['./start_qp-target-gene.sh']
-    # network_mode: host
-    # stdin_open: true
-    # tty: true
     restart: no
     volumes:
       - qiita-data:/qiita_data
@@ -226,10 +214,6 @@ services:
 
   qtp-visualization:
     image: ghcr.io/jlab/qiita-keycloak/qtp-visualization:testcandidate
-    command: ['./start_qtp-visualization.sh']
-    # network_mode: host
-    # stdin_open: true
-    # tty: true
     restart: no
     volumes:
       - qiita-data:/qiita_data
@@ -242,10 +226,6 @@ services:
 
   qtp-diversity:
     image: ghcr.io/jlab/qiita-keycloak/qtp-diversity:testcandidate
-    command: ['./start_qtp-diversity.sh']
-    # network_mode: host
-    # stdin_open: true
-    # tty: true
     restart: no
     volumes:
       - qiita-data:/qiita_data
@@ -258,7 +238,6 @@ services:
 
   qp-deblur:
     image: ghcr.io/jlab/qiita-keycloak/qp-deblur:testcandidate
-    command: ['./start_qp-deblur.sh']
     restart: no
     volumes:
       - qiita-data:/qiita_data
@@ -272,10 +251,6 @@ services:
 
   qp-qiime2:
     image: ghcr.io/jlab/qiita-keycloak/qp-qiime2:testcandidate
-    command: ['./start_qp-qiime2.sh']
-    # network_mode: host
-    # stdin_open: true
-    # tty: true
     restart: no
     volumes:
       - qiita-data:/qiita_data
@@ -289,10 +264,6 @@ services:
 
   qtp-job-output-folder:
     image: ghcr.io/jlab/qiita-keycloak/qtp-job-output-folder:testcandidate
-    command: ['./start_qtp-job-output-folder.sh']
-    # network_mode: host
-    # stdin_open: true
-    # tty: true
     restart: no
     volumes:
       - qiita-data:/qiita_data