diff --git a/orcid-persistence/src/main/resources/orcid-persistence-context.xml b/orcid-persistence/src/main/resources/orcid-persistence-context.xml
index 7857fb72b54..554d47b39a6 100644
--- a/orcid-persistence/src/main/resources/orcid-persistence-context.xml
+++ b/orcid-persistence/src/main/resources/orcid-persistence-context.xml
@@ -477,6 +477,9 @@
     <!-- Statistics -->
     <bean id="statisticsDao" class="org.orcid.persistence.dao.impl.StatisticsDaoImpl">
         <property name="entityManager" ref="entityManager" />
-    </bean>     
+    </bean>   
+    
+    <!-- Redshift panoply -->
+    <bean id="panoplyClient" class="org.orcid.utils.panoply.PanoplyRedshiftClient" />  
     
 </beans>
diff --git a/orcid-test/src/main/resources/properties/test-api-common.properties b/orcid-test/src/main/resources/properties/test-api-common.properties
index 537759cfde2..dc4889fc41d 100644
--- a/orcid-test/src/main/resources/properties/test-api-common.properties
+++ b/orcid-test/src/main/resources/properties/test-api-common.properties
@@ -9,4 +9,16 @@ org.orcid.swagger.authendpoint=https://localhost:8443/orcid-web/oauth/authorize
 # Redis
 org.orcid.core.utils.cache.redis.host=xxx.xxx.com
 org.orcid.core.utils.cache.redis.port=6379
-org.orcid.core.utils.cache.redis.password=XXXX
\ No newline at end of file
+org.orcid.core.utils.cache.redis.password=XXXX
+
+org.orcid.core.utils.cache.redis.password=XXXX
+
+org.orcid.persistence.panoply.cleanup.production=false
+# Panoply redshift database 
+org.orcid.core.utils.panoply.driver=com.amazon.redshift.jdbc.Driver
+org.orcid.core.utils.panoply.maxPoolSize=20
+org.orcid.core.utils.panoply.password=xxx
+org.orcid.core.utils.panoply.idleConnectionTimeout=3600
+org.orcid.core.utils.panoply.connectionTimeout=36000
+org.orcid.core.utils.panoply.jdbcUrl=xxx
+org.orcid.core.utils.panoply.username=xxx
\ No newline at end of file
diff --git a/orcid-test/src/main/resources/properties/test-api-internal.properties b/orcid-test/src/main/resources/properties/test-api-internal.properties
index d85df6f3aba..284325b6265 100644
--- a/orcid-test/src/main/resources/properties/test-api-internal.properties
+++ b/orcid-test/src/main/resources/properties/test-api-internal.properties
@@ -9,4 +9,16 @@ org.orcid.persistence.internal_api.db.readonly.maxPoolSize=3
 # Redis
 org.orcid.core.utils.cache.redis.host=xxx.xxx.com
 org.orcid.core.utils.cache.redis.port=6379
-org.orcid.core.utils.cache.redis.password=XXXX
\ No newline at end of file
+org.orcid.core.utils.cache.redis.password=XXXX
+
+org.orcid.core.utils.cache.redis.password=XXXX
+
+org.orcid.persistence.panoply.cleanup.production=false
+# Panoply redshift database 
+org.orcid.core.utils.panoply.driver=com.amazon.redshift.jdbc.Driver
+org.orcid.core.utils.panoply.maxPoolSize=20
+org.orcid.core.utils.panoply.password=xxx
+org.orcid.core.utils.panoply.idleConnectionTimeout=3600
+org.orcid.core.utils.panoply.connectionTimeout=36000
+org.orcid.core.utils.panoply.jdbcUrl=xxx
+org.orcid.core.utils.panoply.username=xxx
\ No newline at end of file
diff --git a/orcid-test/src/main/resources/properties/test-core.properties b/orcid-test/src/main/resources/properties/test-core.properties
index ab3c0577d4c..1dc1d3e9298 100644
--- a/orcid-test/src/main/resources/properties/test-core.properties
+++ b/orcid-test/src/main/resources/properties/test-core.properties
@@ -76,4 +76,16 @@ org.orcid.core.orgsToGroup.query=select a.* from org_disambiguated a full outer
 # Redis
 org.orcid.core.utils.cache.redis.host=xxx.xxx.com
 org.orcid.core.utils.cache.redis.port=6379
-org.orcid.core.utils.cache.redis.password=XXXX
\ No newline at end of file
+org.orcid.core.utils.cache.redis.password=XXXX
+
+org.orcid.core.utils.cache.redis.password=XXXX
+
+org.orcid.persistence.panoply.cleanup.production=false
+# Panoply redshift database 
+org.orcid.core.utils.panoply.driver=com.amazon.redshift.jdbc.Driver
+org.orcid.core.utils.panoply.maxPoolSize=20
+org.orcid.core.utils.panoply.password=xxx
+org.orcid.core.utils.panoply.idleConnectionTimeout=3600
+org.orcid.core.utils.panoply.connectionTimeout=36000
+org.orcid.core.utils.panoply.jdbcUrl=xxx
+org.orcid.core.utils.panoply.username=xxx
\ No newline at end of file
diff --git a/orcid-test/src/main/resources/properties/test-db.properties b/orcid-test/src/main/resources/properties/test-db.properties
index 8f8e05d0d68..a2c679f182a 100644
--- a/orcid-test/src/main/resources/properties/test-db.properties
+++ b/orcid-test/src/main/resources/properties/test-db.properties
@@ -46,3 +46,15 @@ org.orcid.persistence.togglz.db.testConnectionOnCheckin=true
 org.orcid.persistence.togglz.db.preferredTestQuery=select 1
 org.orcid.persistence.togglz.db.numHelperThreads=5
 org.orcid.persistence.togglz.cache.ttl=60000
+
+org.orcid.core.utils.cache.redis.password=XXXX
+
+org.orcid.persistence.panoply.cleanup.production=false
+# Panoply redshift database 
+org.orcid.core.utils.panoply.driver=com.amazon.redshift.jdbc.Driver
+org.orcid.core.utils.panoply.maxPoolSize=20
+org.orcid.core.utils.panoply.password=xxx
+org.orcid.core.utils.panoply.idleConnectionTimeout=3600
+org.orcid.core.utils.panoply.connectionTimeout=36000
+org.orcid.core.utils.panoply.jdbcUrl=xxx
+org.orcid.core.utils.panoply.username=xxx
diff --git a/orcid-test/src/main/resources/properties/test-scheduler.properties b/orcid-test/src/main/resources/properties/test-scheduler.properties
index 10d29640a51..f1d06636692 100644
--- a/orcid-test/src/main/resources/properties/test-scheduler.properties
+++ b/orcid-test/src/main/resources/properties/test-scheduler.properties
@@ -42,3 +42,15 @@ org.orcid.core.orgs.ror.localZipPath=/tmp/ror/ror.zip
 org.orcid.core.utils.cache.redis.host=xxx.xxx.com
 org.orcid.core.utils.cache.redis.port=6379
 org.orcid.core.utils.cache.redis.password=XXXX
+
+org.orcid.core.utils.cache.redis.password=XXXX
+
+org.orcid.persistence.panoply.cleanup.production=false
+# Panoply redshift database 
+org.orcid.core.utils.panoply.driver=com.amazon.redshift.jdbc.Driver
+org.orcid.core.utils.panoply.maxPoolSize=20
+org.orcid.core.utils.panoply.password=xxx
+org.orcid.core.utils.panoply.idleConnectionTimeout=3600
+org.orcid.core.utils.panoply.connectionTimeout=36000
+org.orcid.core.utils.panoply.jdbcUrl=xxx
+org.orcid.core.utils.panoply.username=xxx
diff --git a/orcid-test/src/main/resources/properties/test-ui.properties b/orcid-test/src/main/resources/properties/test-ui.properties
index 6784fbe3068..9741a3fc49b 100644
--- a/orcid-test/src/main/resources/properties/test-ui.properties
+++ b/orcid-test/src/main/resources/properties/test-ui.properties
@@ -28,4 +28,16 @@ org.orcid.core.profile.lockout.threshhold=10
 # Redis
 org.orcid.core.utils.cache.redis.host=xxx.xxx.com
 org.orcid.core.utils.cache.redis.port=6379
-org.orcid.core.utils.cache.redis.password=XXXX
\ No newline at end of file
+org.orcid.core.utils.cache.redis.password=XXXX
+
+org.orcid.core.utils.cache.redis.password=XXXX
+
+org.orcid.persistence.panoply.cleanup.production=false
+# Panoply redshift database 
+org.orcid.core.utils.panoply.driver=com.amazon.redshift.jdbc.Driver
+org.orcid.core.utils.panoply.maxPoolSize=20
+org.orcid.core.utils.panoply.password=xxx
+org.orcid.core.utils.panoply.idleConnectionTimeout=3600
+org.orcid.core.utils.panoply.connectionTimeout=36000
+org.orcid.core.utils.panoply.jdbcUrl=xxx
+org.orcid.core.utils.panoply.username=xxx
\ No newline at end of file