diff --git a/jscep/pom.xml b/jscep/pom.xml
index f01972b..54ed9a6 100644
--- a/jscep/pom.xml
+++ b/jscep/pom.xml
@@ -1,20 +1,20 @@
 <!--
- ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- ~
- ~ WSO2 Inc. licenses this file to you under the Apache License,
- ~ Version 2.0 (the "License"); you may not use this file except
- ~ in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~    http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied.  See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
+  ~ Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
+  ~
+  ~ Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -23,17 +23,20 @@
     <groupId>io.entgra.com.google.code.jscep</groupId>
     <artifactId>jscep</artifactId>
     <packaging>bundle</packaging>
-    <version>2.3.0.wso2v2</version>
+    <version>2.3.0.entgrav2</version>
     <description>
-        JSCEP bundle 2.3.0.wso2v2
+        JSCEP bundle 2.3.0.entgrav2
     </description>
-    <url>http://wso2.org</url>
+    <url>http://entgra.io</url>
 
     <distributionManagement>
+        <snapshotRepository>
+            <id>maven-snapshots</id>
+            <url>https://nexus.entgra.io/repository/maven-snapshot/</url>
+        </snapshotRepository>
         <repository>
-            <id>wso2.releases</id>
-            <name>WSO2 internal Repository</name>
-            <url>https://maven.wso2.org/nexus/content/repositories/releases/</url>
+            <id>maven-release</id>
+            <url>https://nexus.entgra.io/repository/maven-release/</url>
         </repository>
     </distributionManagement>
 
diff --git a/jscep/target/classes/META-INF/MANIFEST.MF b/jscep/target/classes/META-INF/MANIFEST.MF
deleted file mode 100644
index e5b903c..0000000
--- a/jscep/target/classes/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,83 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Created-By: Apache Maven Bundle Plugin
-Tool: Bnd-0.0.238
-Bnd-LastModified: 1686032732090
-Export-Package: org.jscep.transport;uses:="net.jcip.annotations,org.jsce
- p.transport.response,org.slf4j,org.bouncycastle.util.encoders,javax.net
- .ssl,org.apache.commons.io,org.jscep.transport.request";version="2.3.0"
- ,org.jscep.asn1;uses:="org.bouncycastle.asn1.x500,org.bouncycastle.asn1
- ";version="2.3.0",org.jscep.transport.response;uses:="net.jcip.annotati
- ons,org.slf4j,org.bouncycastle.asn1.cms,org.bouncycastle.cms,org.apache
- .commons.io,org.jscep.transport,org.jscep.util";version="2.3.0",org.jsc
- ep.transaction;uses:="net.jcip.annotations,org.slf4j,org.bouncycastle.a
- sn1.cms,org.bouncycastle.cms,org.apache.commons.io,org.jscep.transport.
- request,org.jscep.transport,org.jscep.transport.response,org.jscep.asn1
- ,org.jscep.util,org.apache.commons.codec.binary,org.apache.commons.lang
- ,org.jscep.message,org.bouncycastle.pkcs";version="2.3.0",org.jscep.uti
- l;uses:="org.bouncycastle.asn1.pkcs,org.slf4j,javax.security.auth.x500,
- org.bouncycastle.asn1,org.bouncycastle.operator,org.bouncycastle.cms.jc
- ajce,org.bouncycastle.cms,org.bouncycastle.crypto.util,org.bouncycastle
- .asn1.x500,org.bouncycastle.cert,org.bouncycastle.operator.jcajce,org.b
- ouncycastle.crypto.params,org.bouncycastle.asn1.x509,org.bouncycastle.u
- til,org.bouncycastle.pkcs";version="2.3.0",org.jscep.server;uses:="org.
- slf4j,javax.servlet.http,org.bouncycastle.operator,org.bouncycastle.cms
- ,org.apache.commons.io,org.jscep.asn1,org.bouncycastle.cert,org.bouncyc
- astle.pkcs,org.bouncycastle.cert.jcajce,org.bouncycastle.asn1,org.bounc
- ycastle.asn1.cms,org.bouncycastle.util.encoders,org.jscep.transport.req
- uest,javax.servlet,org.bouncycastle.asn1.x500,org.jscep.transport.respo
- nse,org.jscep.transaction,org.bouncycastle.operator.jcajce,org.bouncyca
- stle.util,org.jscep.message";version="2.3.0",org.jscep.client.inspect;u
- ses:="org.slf4j,javax.security.auth.x500";version="2.3.0",org.jscep.cli
- ent;uses:="org.slf4j,javax.security.auth.x500,org.bouncycastle.operator
- ,org.jscep.client.verification,org.jscep.asn1,org.bouncycastle.cert,jav
- ax.security.auth.callback,org.apache.commons.codec.binary,org.bouncycas
- tle.pkcs,org.bouncycastle.cert.jcajce,org.bouncycastle.asn1.cms,org.bou
- ncycastle.asn1,org.jscep.transport.request,org.jscep.transport,org.boun
- cycastle.asn1.x500,org.jscep.transport.response,org.jscep.transaction,o
- rg.jscep.util,org.bouncycastle.operator.jcajce,org.bouncycastle.asn1.x5
- 09,org.jscep.client.inspect,org.jscep.message";version="2.3.0",org.jsce
- p.client.verification;uses:="org.apache.commons.codec.binary,org.apache
- .commons.lang";version="2.3.0",org.jscep.message;uses:="javax.crypto,ne
- t.jcip.annotations,org.slf4j,javax.security.auth.x500,org.bouncycastle.
- operator,org.bouncycastle.cms,org.jscep.asn1,org.apache.commons.lang.bu
- ilder,org.bouncycastle.cert,org.bouncycastle.pkcs,org.bouncycastle.cert
- .jcajce,org.bouncycastle.asn1.cms,org.bouncycastle.asn1,javax.crypto.sp
- ec,org.bouncycastle.cms.jcajce,org.bouncycastle.asn1.x500,org.jscep.tra
- nsaction,org.bouncycastle.operator.jcajce,org.bouncycastle.asn1.x509,or
- g.bouncycastle.util";version="2.3.0",org.jscep.transport.request;uses:=
- "org.apache.commons.codec.binary,org.bouncycastle.cms";version="2.3.0"
-Import-Package: javax.crypto;resolution:=optional,javax.crypto.spec;reso
- lution:=optional,javax.net.ssl;resolution:=optional,javax.security.auth
- .callback;resolution:=optional,javax.security.auth.x500;resolution:=opt
- ional,javax.servlet;resolution:=optional,javax.servlet.http;resolution:
- =optional,net.jcip.annotations;resolution:=optional,org.apache.commons.
- codec.binary;version="1.7";resolution:=optional,org.apache.commons.io;v
- ersion="[2.7.0, 2.8.0)",org.apache.commons.lang;version="2.6";resolutio
- n:=optional,org.apache.commons.lang.builder;version="2.6";resolution:=o
- ptional,org.bouncycastle.asn1;version="1.51";resolution:=optional,org.b
- ouncycastle.asn1.cms;version="1.51";resolution:=optional,org.bouncycast
- le.asn1.pkcs;version="1.51";resolution:=optional,org.bouncycastle.asn1.
- x500;version="1.51";resolution:=optional,org.bouncycastle.asn1.x509;ver
- sion="1.51";resolution:=optional,org.bouncycastle.cert;version="1.51";r
- esolution:=optional,org.bouncycastle.cert.jcajce;version="1.51";resolut
- ion:=optional,org.bouncycastle.cms;version="1.51";resolution:=optional,
- org.bouncycastle.cms.jcajce;version="1.51";resolution:=optional,org.bou
- ncycastle.crypto.params;version="1.51";resolution:=optional,org.bouncyc
- astle.crypto.util;version="1.51";resolution:=optional,org.bouncycastle.
- operator;version="1.51";resolution:=optional,org.bouncycastle.operator.
- jcajce;version="1.51";resolution:=optional,org.bouncycastle.pkcs;versio
- n="1.51";resolution:=optional,org.bouncycastle.util;version="1.51";reso
- lution:=optional,org.bouncycastle.util.encoders;version="1.51";resoluti
- on:=optional,org.slf4j;version="1.7";resolution:=optional
-Ignore-Package: org.jscep.transport,org.jscep.asn1,org.jscep.transport.r
- esponse,org.jscep.transaction,org.jscep.util,org.jscep.server,org.jscep
- .client.inspect,org.jscep.client.verification,org.jscep.client,org.jsce
- p.message,org.jscep.transport.request
-Bundle-Name: jscep
-Bundle-Description: JSCEP bundle 2.3.0.wso2v2
-Bundle-SymbolicName: jscep
-Bundle-Version: 2.3.0.wso2v2
-Built-By: amalka
-Build-Jdk: 11.0.18
-
diff --git a/jscep/target/jscep-2.3.0.wso2v2.jar b/jscep/target/jscep-2.3.0.wso2v2.jar
deleted file mode 100644
index 53401f1..0000000
Binary files a/jscep/target/jscep-2.3.0.wso2v2.jar and /dev/null differ
diff --git a/scannotation/pom.xml b/scannotation/pom.xml
index 2891a2e..c2598fa 100644
--- a/scannotation/pom.xml
+++ b/scannotation/pom.xml
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
- ~ Copyright (c) 2015, WSO2 Inc. (http://wso2.com) All Rights Reserved.
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~      http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
--->
+  ~ Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
+  ~
+  ~ Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -22,7 +24,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.entgra.org.scannotation</groupId>
     <artifactId>scannotation</artifactId>
-    <version>1.0.3.wso2v1</version>
+    <version>1.0.3.entgrav1</version>
     <packaging>bundle</packaging>
     <name>Scannotation orbit bundle</name>
     <description>scannotation</description>
@@ -43,17 +45,14 @@
     </dependencies>
 
     <distributionManagement>
-        <repository>
-            <id>wso2.releases</id>
-            <name>WSO2 internal Repository</name>
-            <url>https://maven.wso2.org/nexus/content/repositories/releases/</url>
-        </repository>
-
         <snapshotRepository>
-            <id>wso2.snapshots</id>
-            <name>Apache Snapshot Repository</name>
-            <url>https://maven.wso2.org/nexus/content/repositories/snapshots/</url>
+            <id>maven-snapshots</id>
+            <url>https://nexus.entgra.io/repository/maven-snapshot/</url>
         </snapshotRepository>
+        <repository>
+            <id>maven-release</id>
+            <url>https://nexus.entgra.io/repository/maven-release/</url>
+        </repository>
     </distributionManagement>
 
     <build>
diff --git a/scannotation/target/classes/META-INF/MANIFEST.MF b/scannotation/target/classes/META-INF/MANIFEST.MF
deleted file mode 100644
index 34b0dce..0000000
--- a/scannotation/target/classes/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bnd-LastModified: 1686032383862
-Build-Jdk: 11.0.18
-Built-By: amalka
-Bundle-ClassPath: .,javassist-3.18.1-GA.jar
-Bundle-Description: scannotation
-Bundle-ManifestVersion: 2
-Bundle-Name: scannotation
-Bundle-SymbolicName: scannotation
-Bundle-Version: 1.0.3.wso2v1
-Created-By: Apache Maven Bundle Plugin
-Embed-Dependency: javassist;inline=false
-Embedded-Artifacts: javassist-3.18.1-GA.jar;g="org.javassist";a="javassi
- st";v="3.18.1-GA"
-Export-Package: org.scannotation.archiveiterator;version="1.0.3",org.sca
- nnotation;uses:="org.scannotation.archiveiterator,javax.servlet";versio
- n="1.0.3"
-Import-Package: com.sun.jdi;resolution:=optional,com.sun.jdi.connect;res
- olution:=optional,com.sun.jdi.event;resolution:=optional,com.sun.jdi.re
- quest;resolution:=optional,javax.servlet;resolution:=optional
-Tool: Bnd-1.50.0
diff --git a/scannotation/target/scannotation-1.0.3.wso2v1.jar b/scannotation/target/scannotation-1.0.3.wso2v1.jar
deleted file mode 100644
index 1f495d3..0000000
Binary files a/scannotation/target/scannotation-1.0.3.wso2v1.jar and /dev/null differ