diff --git a/debs/trusty/archivematica-storage-service/Dockerfile b/debs/trusty/archivematica-storage-service/Dockerfile
index c314dc33..4f1b2f85 100644
--- a/debs/trusty/archivematica-storage-service/Dockerfile
+++ b/debs/trusty/archivematica-storage-service/Dockerfile
@@ -7,5 +7,5 @@ RUN apt-get update && \
 RUN wget -O /tmp/pip.py https://bootstrap.pypa.io/get-pip.py && python /tmp/pip.py
 
 # Dependencies are also obtained in the debian build script, this speeds up the process of building packages
-RUN apt-get update &&  apt-get install -y libffi-dev libssl-dev libxslt-dev dh-virtualenv python-dev dh-systemd libmysqlclient-dev postgresql-server-dev-9.5
+RUN apt-get update &&  apt-get install -y libffi-dev libssl-dev libxslt-dev dh-virtualenv python-dev dh-systemd libmysqlclient-dev
 
diff --git a/debs/xenial/archivematica-storage-service/Dockerfile b/debs/xenial/archivematica-storage-service/Dockerfile
index eafeaa2b..c314dc33 100644
--- a/debs/xenial/archivematica-storage-service/Dockerfile
+++ b/debs/xenial/archivematica-storage-service/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:xenial
 
 RUN apt-get update && \
     apt-get install -y dpkg-dev git build-essential wget debhelper \
-    devscripts equivs
+    devscripts equivs quilt
 
 RUN wget -O /tmp/pip.py https://bootstrap.pypa.io/get-pip.py && python /tmp/pip.py
 
diff --git a/debs/xenial/archivematica-storage-service/debian-storage-service/control b/debs/xenial/archivematica-storage-service/debian-storage-service/control
index c4257f22..8ef60e59 100644
--- a/debs/xenial/archivematica-storage-service/debian-storage-service/control
+++ b/debs/xenial/archivematica-storage-service/debian-storage-service/control
@@ -12,7 +12,6 @@ Build-Depends:
     libxml2-dev,
     libxslt-dev,
     python-dev,
-    postgresql-server-dev-9.5,
     rng-tools,
     dh-virtualenv (>= 0.8),
     dh-systemd,
diff --git a/debs/xenial/archivematica-storage-service/debian-storage-service/patches/remove-psycopg-requirement.diff b/debs/xenial/archivematica-storage-service/debian-storage-service/patches/remove-psycopg-requirement.diff
new file mode 100644
index 00000000..c3f1ebf1
--- /dev/null
+++ b/debs/xenial/archivematica-storage-service/debian-storage-service/patches/remove-psycopg-requirement.diff
@@ -0,0 +1,10 @@
+Index: archivematica-storage-service/requirements/production.txt
+===================================================================
+--- archivematica-storage-service.orig/requirements/production.txt
++++ archivematica-storage-service/requirements/production.txt
+@@ -6,4 +6,3 @@
+ # in all cases (i.e. test.txt doesn't need them, but local and production do)
+ dj-database-url==0.4.2
+ mysqlclient==1.3.8
+-psycopg2==2.7.1
+\ No newline at end of file
diff --git a/debs/xenial/archivematica-storage-service/debian-storage-service/patches/series b/debs/xenial/archivematica-storage-service/debian-storage-service/patches/series
new file mode 100644
index 00000000..db2dfea5
--- /dev/null
+++ b/debs/xenial/archivematica-storage-service/debian-storage-service/patches/series
@@ -0,0 +1 @@
+remove-psycopg-requirement.diff