diff --git a/.github/workflows/container-ci.yml b/.github/workflows/container-ci.yml
index 94e0d04..17b428c 100644
--- a/.github/workflows/container-ci.yml
+++ b/.github/workflows/container-ci.yml
@@ -52,5 +52,6 @@ jobs:
         with:
           context: .
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: ${{ steps.metadata.outputs.tags }}
           labels: ${{ steps.metadata.outputs.labels }}
\ No newline at end of file
diff --git a/main.nf b/main.nf
index 43ca9d0..558ed81 100644
--- a/main.nf
+++ b/main.nf
@@ -35,10 +35,7 @@ workflow SAMPLESHEET_SPLIT {
 
 process synapse_get {
 
-    conda "bioconda::synapseclient=2.6.0"
-    container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/synapseclient:2.6.0--pyh5e36f6f_0' :
-        'quay.io/biocontainers/synapseclient:2.6.0--pyh5e36f6f_0' }"
+    container "ghcr.io/ncihtan/nf-imagecleaner"
 
     tag "${meta.entityid}"
 
@@ -65,8 +62,7 @@ process synapse_get {
 }
 
 process cds_upload {
-    conda "bioconda::awscli=1.18.69"
-    container "local-aws-cli-v2"
+    container "ghcr.io/ncihtan/nf-imagecleaner"
 
     tag "${meta.entityid}"