diff --git a/auth/cli-codegen/pom.xml b/auth/cli-codegen/pom.xml
index 020f086..af9cb36 100644
--- a/auth/cli-codegen/pom.xml
+++ b/auth/cli-codegen/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.auth</groupId>
         <artifactId>auth</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>cli-codegen</artifactId>
diff --git a/auth/cli-editor/pom.xml b/auth/cli-editor/pom.xml
index 7250cb7..0091de6 100644
--- a/auth/cli-editor/pom.xml
+++ b/auth/cli-editor/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.auth</groupId>
         <artifactId>auth</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>cli-editor</artifactId>
diff --git a/auth/pom.xml b/auth/pom.xml
index 88540c5..2ddfa11 100644
--- a/auth/pom.xml
+++ b/auth/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp</groupId>
         <artifactId>apex-pdp</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.auth</groupId>
diff --git a/context/context-management/pom.xml b/context/context-management/pom.xml
index 4754ff8..472bcfd 100644
--- a/context/context-management/pom.xml
+++ b/context/context-management/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.context</groupId>
         <artifactId>context</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>context-management</artifactId>
diff --git a/context/pom.xml b/context/pom.xml
index 2cd665e..92263db 100644
--- a/context/pom.xml
+++ b/context/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp</groupId>
         <artifactId>apex-pdp</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.context</groupId>
diff --git a/core/pom.xml b/core/pom.xml
index 4e5d431..461ba54 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp</groupId>
         <artifactId>apex-pdp</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.core</groupId>
diff --git a/examples/examples-aadm/pom.xml b/examples/examples-aadm/pom.xml
index 54a8c88..7ad7938 100644
--- a/examples/examples-aadm/pom.xml
+++ b/examples/examples-aadm/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.examples</groupId>
         <artifactId>examples</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>examples-aadm</artifactId>
diff --git a/examples/examples-acm/pom.xml b/examples/examples-acm/pom.xml
index be4a543..d896095 100644
--- a/examples/examples-acm/pom.xml
+++ b/examples/examples-acm/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.examples</groupId>
         <artifactId>examples</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
     <artifactId>examples-acm</artifactId>
     <name>examples-acm</name>
diff --git a/examples/examples-adaptive/pom.xml b/examples/examples-adaptive/pom.xml
index 0ec044f..f3f2bc7 100644
--- a/examples/examples-adaptive/pom.xml
+++ b/examples/examples-adaptive/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.examples</groupId>
         <artifactId>examples</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>examples-adaptive</artifactId>
diff --git a/examples/examples-decisionmaker-sharedcontext/pom.xml b/examples/examples-decisionmaker-sharedcontext/pom.xml
index 4b6a8da..7891682 100644
--- a/examples/examples-decisionmaker-sharedcontext/pom.xml
+++ b/examples/examples-decisionmaker-sharedcontext/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.examples</groupId>
         <artifactId>examples</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>examples-decisionmaker-sharedcontext</artifactId>
diff --git a/examples/examples-decisionmaker/pom.xml b/examples/examples-decisionmaker/pom.xml
index b6597f0..00a4ae5 100644
--- a/examples/examples-decisionmaker/pom.xml
+++ b/examples/examples-decisionmaker/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.examples</groupId>
         <artifactId>examples</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>examples-decisionmaker</artifactId>
diff --git a/examples/examples-grpc/pom.xml b/examples/examples-grpc/pom.xml
index 040fc31..9ccd9d9 100644
--- a/examples/examples-grpc/pom.xml
+++ b/examples/examples-grpc/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.examples</groupId>
         <artifactId>examples</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
     <artifactId>examples-grpc</artifactId>
     <name>examples-grpc</name>
diff --git a/examples/examples-myfirstpolicy/pom.xml b/examples/examples-myfirstpolicy/pom.xml
index 2dc1904..5c59963 100644
--- a/examples/examples-myfirstpolicy/pom.xml
+++ b/examples/examples-myfirstpolicy/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.onap.policy.apex-pdp.examples</groupId>
     <artifactId>examples</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>examples-myfirstpolicy</artifactId>
diff --git a/examples/examples-onap-bbs/pom.xml b/examples/examples-onap-bbs/pom.xml
index cc31b4f..4d2c47b 100644
--- a/examples/examples-onap-bbs/pom.xml
+++ b/examples/examples-onap-bbs/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.examples</groupId>
         <artifactId>examples</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>examples-onap-bbs</artifactId>
diff --git a/examples/examples-onap-vcpe/pom.xml b/examples/examples-onap-vcpe/pom.xml
index 10ee41d..390b9c0 100644
--- a/examples/examples-onap-vcpe/pom.xml
+++ b/examples/examples-onap-vcpe/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.examples</groupId>
         <artifactId>examples</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>examples-onap-vcpe</artifactId>
diff --git a/examples/examples-periodic/pom.xml b/examples/examples-periodic/pom.xml
index 94bca49..374c0a7 100644
--- a/examples/examples-periodic/pom.xml
+++ b/examples/examples-periodic/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.examples</groupId>
         <artifactId>examples</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>examples-periodic</artifactId>
diff --git a/examples/examples-servlet/pom.xml b/examples/examples-servlet/pom.xml
index 4b4f277..90bdd4b 100644
--- a/examples/examples-servlet/pom.xml
+++ b/examples/examples-servlet/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.examples</groupId>
         <artifactId>examples</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>examples-servlet</artifactId>
diff --git a/examples/pom.xml b/examples/pom.xml
index 77dbdf6..20e05ce 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp</groupId>
         <artifactId>apex-pdp</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.examples</groupId>
diff --git a/model/pom.xml b/model/pom.xml
index e6312da..bdbb7f7 100644
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp</groupId>
         <artifactId>apex-pdp</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.model</groupId>
diff --git a/packages/apex-pdp-docker/pom.xml b/packages/apex-pdp-docker/pom.xml
index 7892768..bbcd660 100644
--- a/packages/apex-pdp-docker/pom.xml
+++ b/packages/apex-pdp-docker/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.packages</groupId>
         <artifactId>apex-packages</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>apex-pdp-docker</artifactId>
diff --git a/packages/apex-pdp-docker/src/main/docker/Dockerfile b/packages/apex-pdp-docker/src/main/docker/Dockerfile
index 4b80a81..4ec29df 100644
--- a/packages/apex-pdp-docker/src/main/docker/Dockerfile
+++ b/packages/apex-pdp-docker/src/main/docker/Dockerfile
@@ -25,7 +25,7 @@
 COPY /maven/apex-pdp-package-full.tar.gz /packages/
 RUN tar xvzf /packages/apex-pdp-package-full.tar.gz --directory /extracted/
 
-FROM onap/policy-jdk-alpine:4.0.0
+FROM onap/policy-jdk-alpine:4.0.1-SNAPSHOT
 
 LABEL maintainer="Policy Team"
 LABEL org.opencontainers.image.title="Policy APEX PDP"
diff --git a/packages/apex-pdp-package-full/pom.xml b/packages/apex-pdp-package-full/pom.xml
index b0b42ef..d55386c 100644
--- a/packages/apex-pdp-package-full/pom.xml
+++ b/packages/apex-pdp-package-full/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.packages</groupId>
         <artifactId>apex-packages</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>apex-pdp-package-full</artifactId>
diff --git a/packages/pom.xml b/packages/pom.xml
index 0e431b9..ea11955 100644
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp</groupId>
         <artifactId>apex-pdp</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.packages</groupId>
diff --git a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/pom.xml b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/pom.xml
index 038500a..7e5c568 100644
--- a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/pom.xml
+++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-hazelcast/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution</groupId>
         <artifactId>plugins-context-distribution</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-context-distribution-hazelcast</artifactId>
diff --git a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml
index 5aba445..49ecf27 100644
--- a/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml
+++ b/plugins/plugins-context/plugins-context-distribution/plugins-context-distribution-infinispan/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution</groupId>
         <artifactId>plugins-context-distribution</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-context-distribution-infinispan</artifactId>
diff --git a/plugins/plugins-context/plugins-context-distribution/pom.xml b/plugins/plugins-context/plugins-context-distribution/pom.xml
index 4bbeb5f..c0a6ea5 100644
--- a/plugins/plugins-context/plugins-context-distribution/pom.xml
+++ b/plugins/plugins-context/plugins-context-distribution/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-context</groupId>
         <artifactId>plugins-context</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-distribution</groupId>
diff --git a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/pom.xml b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/pom.xml
index c480ed0..036708e 100644
--- a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/pom.xml
+++ b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-curator/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-locking</groupId>
         <artifactId>plugins-context-locking</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-context-locking-curator</artifactId>
diff --git a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/pom.xml b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/pom.xml
index ce55f91..63bd736 100644
--- a/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/pom.xml
+++ b/plugins/plugins-context/plugins-context-locking/plugins-context-locking-hazelcast/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-locking</groupId>
         <artifactId>plugins-context-locking</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-context-locking-hazelcast</artifactId>
diff --git a/plugins/plugins-context/plugins-context-locking/pom.xml b/plugins/plugins-context/plugins-context-locking/pom.xml
index c894b50..3ac0c75 100644
--- a/plugins/plugins-context/plugins-context-locking/pom.xml
+++ b/plugins/plugins-context/plugins-context-locking/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-context</groupId>
         <artifactId>plugins-context</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-locking</groupId>
diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml
index 3c7d231..1fa1670 100644
--- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-avro/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema</groupId>
         <artifactId>plugins-context-schema</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-context-schema-avro</artifactId>
diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-json/pom.xml b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-json/pom.xml
index 82a4075..c46b262 100644
--- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-json/pom.xml
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-json/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema</groupId>
         <artifactId>plugins-context-schema</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-context-schema-json</artifactId>
diff --git a/plugins/plugins-context/plugins-context-schema/pom.xml b/plugins/plugins-context/plugins-context-schema/pom.xml
index c1b414f..e6ad64c 100644
--- a/plugins/plugins-context/plugins-context-schema/pom.xml
+++ b/plugins/plugins-context/plugins-context-schema/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-context</groupId>
         <artifactId>plugins-context</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema</groupId>
diff --git a/plugins/plugins-context/pom.xml b/plugins/plugins-context/pom.xml
index 98195f7..2fed081 100644
--- a/plugins/plugins-context/pom.xml
+++ b/plugins/plugins-context/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.plugins.plugins-context</groupId>
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-grpc/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-grpc/pom.xml
index 63b6397..d4bc407 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-grpc/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-grpc/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId>
         <artifactId>plugins-event-carrier</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-event-carrier-grpc</artifactId>
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/pom.xml
index aeecd42..6881edc 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-jms/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId>
         <artifactId>plugins-event-carrier</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-event-carrier-jms</artifactId>
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml
index 5a3dbdb..f243147 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId>
         <artifactId>plugins-event-carrier</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-event-carrier-kafka</artifactId>
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/pom.xml
index 5856a5a..b320005 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId>
         <artifactId>plugins-event-carrier</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-event-carrier-restclient</artifactId>
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/pom.xml
index ade558b..26621e6 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId>
         <artifactId>plugins-event-carrier</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-event-carrier-restrequestor</artifactId>
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/pom.xml
index 422bbe6..ce160e1 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId>
         <artifactId>plugins-event-carrier</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-event-carrier-restserver</artifactId>
diff --git a/plugins/plugins-event/plugins-event-carrier/pom.xml b/plugins/plugins-event/plugins-event-carrier/pom.xml
index 80205d1..41b604b 100644
--- a/plugins/plugins-event/plugins-event-carrier/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-event</groupId>
         <artifactId>plugins-event</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId>
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/pom.xml b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/pom.xml
index 2ca3cf2..aa9a031 100644
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/pom.xml
+++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-jms/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-protocol</groupId>
         <artifactId>plugins-event-protocol</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-event-protocol-jms</artifactId>
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/pom.xml b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/pom.xml
index 62d1fc2..899d62b 100644
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/pom.xml
+++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-yaml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-protocol</groupId>
         <artifactId>plugins-event-protocol</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-event-protocol-yaml</artifactId>
diff --git a/plugins/plugins-event/plugins-event-protocol/pom.xml b/plugins/plugins-event/plugins-event-protocol/pom.xml
index 7ef918d..08f1b5d 100644
--- a/plugins/plugins-event/plugins-event-protocol/pom.xml
+++ b/plugins/plugins-event/plugins-event-protocol/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-event</groupId>
         <artifactId>plugins-event</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-protocol</groupId>
diff --git a/plugins/plugins-event/pom.xml b/plugins/plugins-event/pom.xml
index fec8fec..a038cee 100644
--- a/plugins/plugins-event/pom.xml
+++ b/plugins/plugins-event/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.plugins.plugins-event</groupId>
diff --git a/plugins/plugins-executor/plugins-executor-java/pom.xml b/plugins/plugins-executor/plugins-executor-java/pom.xml
index 27a80af..5e192fc 100644
--- a/plugins/plugins-executor/plugins-executor-java/pom.xml
+++ b/plugins/plugins-executor/plugins-executor-java/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-executor</groupId>
         <artifactId>plugins-executor</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-executor-java</artifactId>
diff --git a/plugins/plugins-executor/plugins-executor-javascript/pom.xml b/plugins/plugins-executor/plugins-executor-javascript/pom.xml
index f8df9f5..4622124 100644
--- a/plugins/plugins-executor/plugins-executor-javascript/pom.xml
+++ b/plugins/plugins-executor/plugins-executor-javascript/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-executor</groupId>
         <artifactId>plugins-executor</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-executor-javascript</artifactId>
diff --git a/plugins/plugins-executor/plugins-executor-jruby/pom.xml b/plugins/plugins-executor/plugins-executor-jruby/pom.xml
index fa1b702..dbaf9fe 100644
--- a/plugins/plugins-executor/plugins-executor-jruby/pom.xml
+++ b/plugins/plugins-executor/plugins-executor-jruby/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-executor</groupId>
         <artifactId>plugins-executor</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-executor-jruby</artifactId>
diff --git a/plugins/plugins-executor/plugins-executor-mvel/pom.xml b/plugins/plugins-executor/plugins-executor-mvel/pom.xml
index e4076f6..10b8ba9 100644
--- a/plugins/plugins-executor/plugins-executor-mvel/pom.xml
+++ b/plugins/plugins-executor/plugins-executor-mvel/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins.plugins-executor</groupId>
         <artifactId>plugins-executor</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>plugins-executor-mvel</artifactId>
diff --git a/plugins/plugins-executor/pom.xml b/plugins/plugins-executor/pom.xml
index 9b42fe6..cca587c 100644
--- a/plugins/plugins-executor/pom.xml
+++ b/plugins/plugins-executor/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.plugins</groupId>
         <artifactId>plugins</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.plugins.plugins-executor</groupId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index acb8b91..29b2f86 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp</groupId>
         <artifactId>apex-pdp</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.plugins</groupId>
diff --git a/pom.xml b/pom.xml
index 72ba3c4..40093a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,13 +27,13 @@
     <parent>
         <groupId>org.onap.policy.parent</groupId>
         <artifactId>integration</artifactId>
-        <version>5.0.0</version>
+        <version>5.0.1-SNAPSHOT</version>
         <relativePath />
     </parent>
 
     <groupId>org.onap.policy.apex-pdp</groupId>
     <artifactId>apex-pdp</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>policy-apex-pdp</name>
@@ -46,8 +46,8 @@
         </sonar.javascript.lcov.reportPaths>
 
         <!-- Policy framework dependencies -->
-        <version.policy.common>3.0.0</version.policy.common>
-        <version.policy.models>4.0.0</version.policy.models>
+        <version.policy.common>3.0.1-SNAPSHOT</version.policy.common>
+        <version.policy.models>4.0.1-SNAPSHOT</version.policy.models>
 
         <!-- Apex-specific dependencies -->
         <version.activemq>5.18.3</version.activemq>
diff --git a/services/pom.xml b/services/pom.xml
index 0d3bf10..357bb38 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp</groupId>
         <artifactId>apex-pdp</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.services</groupId>
diff --git a/services/services-engine/pom.xml b/services/services-engine/pom.xml
index 6d0b206..66a4dbc 100644
--- a/services/services-engine/pom.xml
+++ b/services/services-engine/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.services</groupId>
         <artifactId>services</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>services-engine</artifactId>
diff --git a/services/services-onappf/pom.xml b/services/services-onappf/pom.xml
index 799f580..1110123 100644
--- a/services/services-onappf/pom.xml
+++ b/services/services-onappf/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.services</groupId>
         <artifactId>services</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>services-onappf</artifactId>
diff --git a/testsuites/apex-pdp-stability/pom.xml b/testsuites/apex-pdp-stability/pom.xml
index 56b740c..6d8faf8 100644
--- a/testsuites/apex-pdp-stability/pom.xml
+++ b/testsuites/apex-pdp-stability/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.testsuites</groupId>
         <artifactId>apex-testsuites</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.testsuites.stability</groupId>
diff --git a/testsuites/integration/integration-common/pom.xml b/testsuites/integration/integration-common/pom.xml
index 7b3ee05..47bb580 100644
--- a/testsuites/integration/integration-common/pom.xml
+++ b/testsuites/integration/integration-common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.testsuites.integration</groupId>
         <artifactId>apex-integration</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
     <artifactId>integration-common</artifactId>
 
diff --git a/testsuites/integration/integration-executor-test/pom.xml b/testsuites/integration/integration-executor-test/pom.xml
index 3762223..059d8f3 100644
--- a/testsuites/integration/integration-executor-test/pom.xml
+++ b/testsuites/integration/integration-executor-test/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.testsuites.integration</groupId>
         <artifactId>apex-integration</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>integration-executor-test</artifactId>
diff --git a/testsuites/integration/integration-uservice-test/pom.xml b/testsuites/integration/integration-uservice-test/pom.xml
index a3ef551..3e43f5c 100644
--- a/testsuites/integration/integration-uservice-test/pom.xml
+++ b/testsuites/integration/integration-uservice-test/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.testsuites.integration</groupId>
         <artifactId>apex-integration</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>integration-uservice-test</artifactId>
diff --git a/testsuites/integration/pom.xml b/testsuites/integration/pom.xml
index 891860a..6d57e3b 100644
--- a/testsuites/integration/pom.xml
+++ b/testsuites/integration/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.testsuites</groupId>
         <artifactId>apex-testsuites</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.testsuites.integration</groupId>
diff --git a/testsuites/performance/performance-benchmark-test/pom.xml b/testsuites/performance/performance-benchmark-test/pom.xml
index eef02b7..339e93b 100644
--- a/testsuites/performance/performance-benchmark-test/pom.xml
+++ b/testsuites/performance/performance-benchmark-test/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.testsuites.performance</groupId>
         <artifactId>apex-performance</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>performance-benchmark-test</artifactId>
diff --git a/testsuites/performance/pom.xml b/testsuites/performance/pom.xml
index 2aeba33..fbea144 100644
--- a/testsuites/performance/pom.xml
+++ b/testsuites/performance/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.testsuites</groupId>
         <artifactId>apex-testsuites</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.testsuites.performance</groupId>
diff --git a/testsuites/pom.xml b/testsuites/pom.xml
index 78bd8ad..4a46d04 100644
--- a/testsuites/pom.xml
+++ b/testsuites/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp</groupId>
         <artifactId>apex-pdp</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.testsuites</groupId>
diff --git a/tools/model-generator/pom.xml b/tools/model-generator/pom.xml
index a3b233b..9116af9 100644
--- a/tools/model-generator/pom.xml
+++ b/tools/model-generator/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.tools</groupId>
         <artifactId>tools</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>model-generator</artifactId>
diff --git a/tools/pom.xml b/tools/pom.xml
index bffdce4..df80aef 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp</groupId>
         <artifactId>apex-pdp</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.apex-pdp.tools</groupId>
diff --git a/tools/simple-wsclient/pom.xml b/tools/simple-wsclient/pom.xml
index feb4595..2d7de02 100644
--- a/tools/simple-wsclient/pom.xml
+++ b/tools/simple-wsclient/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.tools</groupId>
         <artifactId>tools</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>simple-wsclient</artifactId>
diff --git a/tools/tools-common/pom.xml b/tools/tools-common/pom.xml
index a8313bb..2f7de27 100644
--- a/tools/tools-common/pom.xml
+++ b/tools/tools-common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.apex-pdp.tools</groupId>
         <artifactId>tools</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>tools-common</artifactId>
diff --git a/version.properties b/version.properties
index 19e0714..bac5244 100644
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 
 major=4
 minor=0
-patch=0
+patch=1
 
 base_version=${major}.${minor}.${patch}