diff --git a/package/go/1.18/install.sh b/package/go/1.18/install.sh
index 2c132983ee1d029d6442c8100a95c3e54d1c8973..c8c5894ab7c90ceff73c1aeeff18a842c6535e0f 100755
--- a/package/go/1.18/install.sh
+++ b/package/go/1.18/install.sh
@@ -3,10 +3,13 @@
 set -x
 set -e
 cd ${JARVIS_TMP}
-file_name='go1.18.linux-arm64.tar.gz'
-if [ ! -f "${JARVIS_DOWNLOAD}/${file_name}" ]; then
-wget --no-check-certificate -P ${JARVIS_DOWNLOAD} https://go.dev/dl/${file_name}
+# check Arch
+if [ x$(arch) = xaarch64 ];then
+    file_name='go1.18.linux-arm64.tar.gz'
+else
+    file_name='go1.18.linux-amd64.tar.gz'
 fi
+. ${DOWNLOAD_TOOL} -u  https://go.dev/dl/${file_name}
 rm -rf /usr/local/go
 tar -xzvf ${JARVIS_DOWNLOAD}/${file_name} -C /usr/local
-export PATH=/usr/local/go/bin:$PATH
+export PATH=/usr/local/go/bin:$PATH
\ No newline at end of file
diff --git a/package/singularity/3.8.4/.keep b/package/singularity/3.8.4/.keep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/package/singularity/3.8.4/install.sh b/package/singularity/3.8.4/install.sh
new file mode 100644
index 0000000000000000000000000000000000000000..ec625aff0caf6bba5c99985658885c97eba5106b
--- /dev/null
+++ b/package/singularity/3.8.4/install.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+set -x
+set -e
+cd ${JARVIS_TMP}
+export PATH=/usr/local/go/bin:$PATH
+#sudo yum install -y libseccomp-devel squashfs-tools cryptsetup
+file_noext='singularity-ce-3.8.4'
+file_name="${file_noext}.tar.gz"
+. ${DOWNLOAD_TOOL} -u  https://github.com/sylabs/singularity/releases/download/v3.8.4/${file_name}
+rm -rf ${file_noext}
+tar -xzvf ${JARVIS_DOWNLOAD}/${file_name}
+cd ${file_noext}
+./mconfig
+make -C builddir
+sudo make -C builddir install
\ No newline at end of file