diff --git a/Dockerfile b/Dockerfile
index 90a691e..cc21e16 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,9 +8,9 @@ FROM centos:centos7
 ENV TOMCAT_MAJOR=9 \
     TOMCAT_VERSION=9.0.31 \
 ##shib-idp \
-    VERSION=4.0.0-beta2 \
+    VERSION=4.0.0 \
 ##TIER \
-    TIERVERSION=20200228 \
+    TIERVERSION=20200311 \
 ################## \
 ### OTHER VARS ### \
 ################## \
diff --git a/container_files/idp/idp.installer.properties b/container_files/idp/idp.installer.properties
index 5f4b195..ace3ea1 100644
--- a/container_files/idp/idp.installer.properties
+++ b/container_files/idp/idp.installer.properties
@@ -1,4 +1,4 @@
-idp.src.dir=/tmp/shibboleth/shibboleth-identity-provider-4.0.0-beta2
+idp.src.dir=/tmp/shibboleth/shibboleth-identity-provider-4.0.0
 idp.target.dir=/opt/shibboleth-idp
 idp.host.name=idp.example.org
 idp.sealer.password=changeit
diff --git a/test-compose/idp/Dockerfile b/test-compose/idp/Dockerfile
index 671b9ad..fa052c8 100644
--- a/test-compose/idp/Dockerfile
+++ b/test-compose/idp/Dockerfile
@@ -1,4 +1,4 @@
-FROM tier/shib-idp:4.0.beta2_20200228
+FROM tier/shib-idp:4.0.0_20200311
 
 # The build args below can be used at build-time to tell the build process where to find your config files.  This is for a completely burned-in config.
 ARG TOMCFG=config/tomcat