diff --git a/debs/jammy/Makefile b/debs/jammy/Makefile
index 9e5ca998..0cbc32b9 100644
--- a/debs/jammy/Makefile
+++ b/debs/jammy/Makefile
@@ -6,7 +6,6 @@ build:
 	make -C ./archivematica-storage-service
 	make -C ./archivematica
 	make -C ./bulk_extractor
-	make -C ./fits
 	make -C ./jhove
 	make -C ./temporal-ui
 
diff --git a/debs/jammy/archivematica/debian-MCPClient/control b/debs/jammy/archivematica/debian-MCPClient/control
index 4e7edc1e..5ca6e9c3 100644
--- a/debs/jammy/archivematica/debian-MCPClient/control
+++ b/debs/jammy/archivematica/debian-MCPClient/control
@@ -18,7 +18,6 @@ Depends:
 	clamav-daemon,
 	ffmpeg (>= 7:3.0),
 	libavcodec-extra58,
-	fits (>= 1.1.0),
 	gearman,
 	imagemagick (>=8:6.7.7.10),
 	inkscape,
@@ -30,7 +29,6 @@ Depends:
 	md5deep,
 	mediaconch (>= 18.03),
 	mediainfo,
-	nailgun,
 	nfs-common,
 	openjdk-8-jre-headless,
 	p7zip-full,
diff --git a/rpms/EL8/Makefile b/rpms/EL8/Makefile
index a6553a7d..56ff13fc 100644
--- a/rpms/EL8/Makefile
+++ b/rpms/EL8/Makefile
@@ -4,8 +4,6 @@ all: build createrepo
 
 build:
 	make -C ./siegfried
-	make -C ./nailgun
-	make -C ./fits
 	make -C ./jhove
 	make -C ./cadence
 	make -C ./cadence-web
diff --git a/rpms/EL9/Makefile b/rpms/EL9/Makefile
index 489ba7d7..c30fb962 100644
--- a/rpms/EL9/Makefile
+++ b/rpms/EL9/Makefile
@@ -6,8 +6,6 @@ build:
 	make -C ./archivematica
 	make -C ./archivematica-storage-service
 	make -C ./siegfried
-	make -C ./nailgun
-	make -C ./fits
 	make -C ./jhove
 	make -C ./cadence
 	make -C ./cadence-web
diff --git a/rpms/EL9/archivematica/archivematica.spec b/rpms/EL9/archivematica/archivematica.spec
index fec4f584..b55a3f2c 100644
--- a/rpms/EL9/archivematica/archivematica.spec
+++ b/rpms/EL9/archivematica/archivematica.spec
@@ -64,7 +64,6 @@ Requires: md5deep
 Requires: uuid
 # Packages from Archivematica repo
 Requires: siegfried
-Requires: fits
 Requires: atool
 Requires: jhove
 # Packages from https://forensics.cert.org/
diff --git a/tests/archivematica/EL9/install.sh b/tests/archivematica/EL9/install.sh
index bacd49d6..62e18335 100755
--- a/tests/archivematica/EL9/install.sh
+++ b/tests/archivematica/EL9/install.sh
@@ -174,8 +174,6 @@ sudo -u root bash -c "echo 'ARCHIVEMATICA_MCPCLIENT_MCPCLIENT_SEARCH_ENABLED=${s
 
 sudo -u root systemctl enable archivematica-mcp-client
 sudo -u root systemctl start archivematica-mcp-client
-sudo -u root systemctl enable fits-nailgun
-sudo -u root systemctl start fits-nailgun
 sudo -u root systemctl enable clamd@scan
 sudo -u root systemctl start clamd@scan
 
diff --git a/tests/archivematica/jammy/install.sh b/tests/archivematica/jammy/install.sh
index 91b203ee..a6d785bb 100755
--- a/tests/archivematica/jammy/install.sh
+++ b/tests/archivematica/jammy/install.sh
@@ -94,8 +94,6 @@ sudo service archivematica-mcp-client restart
 sudo service archivematica-storage-service start
 sudo service archivematica-dashboard restart
 sudo service nginx restart
-sudo systemctl enable fits-nailgun
-sudo service fits-nailgun start
 
 sudo -u archivematica bash -c " \
     set -a -e -x