diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 1e53f455..b346cb5b 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,8 +1,8 @@
 ---
 name: publish
 
-on:
-  push:
+# on:
+#   push:
 
 jobs:
   publish:
@@ -17,7 +17,7 @@ jobs:
         with:
           go-version: 1.17.3
 
-      - name: Install Singularity dependencies
+      - name: Install Apptainer dependencies
         run: |
           sudo apt-get install -f -y build-essential libssl-dev uuid-dev squashfs-tools libseccomp-dev cryptsetup-bin libgpgme-dev
 
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index d85dfcce..51fbd60d 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -17,7 +17,7 @@ jobs:
         with:
           go-version: 1.17.3
 
-      - name: Install Singularity dependencies
+      - name: Install Apptainer dependencies
         run: |
           sudo apt-get install -f -y build-essential libssl-dev uuid-dev squashfs-tools libseccomp-dev cryptsetup-bin libgpgme-dev
 
diff --git a/.gitmodules b/.gitmodules
index e69de29b..c63fe10a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "apptainer_source"]
+	path = apptainer_source
+	url = https://github.com/apptainer/apptainer.git
diff --git a/Makefile b/Makefile
index 043bfa0c..ba51945b 100755
--- a/Makefile
+++ b/Makefile
@@ -51,16 +51,16 @@ help:
 
 ifndef SKIPCLI
 
-clidocs: cli/singularity.rst
+clidocs: cli/apptainer.rst
 
-singularity_source/builddir/singularity:
-	cd singularity_source &&\
+apptainer_source/builddir/apptainer:
+	cd apptainer_source &&\
 	./mconfig &&\
 	cd builddir &&\
 	make
 
-cli/singularity.rst: singularity_source/builddir/singularity
-	cd singularity_source &&\
+cli/apptainer.rst: apptainer_source/builddir/apptainer
+	cd apptainer_source &&\
 	go run ./cmd/docs rst --dir ../cli
 
 endif
diff --git a/apptainer_source b/apptainer_source
new file mode 160000
index 00000000..e4b2ff04
--- /dev/null
+++ b/apptainer_source
@@ -0,0 +1 @@
+Subproject commit e4b2ff04b4ea849f05f18269696739fc41e56325