diff --git a/config.mk b/config.mk
index fcc4525..0b19716 100644
--- a/config.mk
+++ b/config.mk
@@ -38,8 +38,8 @@ IMAGE_FORMATS = hdd iso
 SIGNING_SERVER = cvm-sign01.cern.ch
 SINGING_URL = https://$(SIGNING_SERVER)/cgi-bin/cernvm/sign-image
 CA_BUNDLE = /etc/pki/tls/certs/cern-ca-bundle.crt
-HOST_CERT = /etc/pki/tls/certs/cvm-build09.crt
-HOST_KEY = /etc/pki/tls/private/cvm-build09.key
+HOST_CERT = /etc/pki/tls/certs/cvm-build20.crt
+HOST_KEY = /etc/pki/tls/private/cvm-build20.key
 SIGNING_DN = /DC=ch/DC=cern/OU=computers/CN=cvm-sign01.cern.ch
 
 # Set to one of CERNVM_BRANCHES by main Makefile
diff --git a/packages.d/cvmfs/config.mk b/packages.d/cvmfs/config.mk
index 967cbd7..fa7e05a 100644
--- a/packages.d/cvmfs/config.mk
+++ b/packages.d/cvmfs/config.mk
@@ -3,4 +3,4 @@ CVMFS_SOURCETREE = cvmfs-git-ef3f73267907f632
 #CVMFS_TARBALL = cvmfs-$(CVMFS_UPSTREAM_VERSION).tar.gz
 CVMFS_TARBALL = cvmfs-git-ef3f73267907f632.tar.gz
 #CVMFS_SOURCE = https://ecsft.cern.ch/dist/cvmfs/cvmfs-$(CVMFS_UPSTREAM_VERSION)/source.tar.gz
-CVMFS_SOURCE = https://ecsft.cern.ch/dist/cvmfs/nightlies/cvmfs-git-540-ef3f73267907f632/source.tar.gz
+CVMFS_SOURCE = https://ecsft.cern.ch/dist/cvmfs/nightlies/old/cvmfs-git-540-ef3f73267907f632/source.tar.gz