diff --git a/Jenkinsfile b/Jenkinsfile
index 6497f8a2a..6415a6761 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,8 +12,8 @@ node {
         }
 
         stage('Build image') {
-            app = docker.build("dockerhub/sunbird-rc-core","target")
-            claimApp = docker.build("dockerhub/sunbird-rc-claim-ms","java/claim")
+            app = docker.build("ghcr.io/sunbird-rc/sunbird-rc-core","target")
+            claimApp = docker.build("ghcr.io/sunbird-rc/sunbird-rc-claim-ms","java/claim")
         }
 
         // stage('Test image') {
@@ -39,8 +39,8 @@ node {
 
 //         stage('Deploy image') {
 //             sh "ssh kesavan@10.4.0.6 'kubectl get pods -n ndear'"
-//             sh "ssh kesavan@10.4.0.6 'kubectl set image deployment/registry registry=dockerhub/sunbird-rc:${env.BUILD_NUMBER} --record --namespace=ndear'"
-//             sh "ssh kesavan@10.4.0.6 'kubectl set image deployment/claim-ms claim-ms=dockerhub/sunbird-rc-claim-ms:${env.BUILD_NUMBER} --record --namespace=ndear'"
+//             sh "ssh kesavan@10.4.0.6 'kubectl set image deployment/registry registry=ghcr.io/sunbird-rc/sunbird-rc:${env.BUILD_NUMBER} --record --namespace=ndear'"
+//             sh "ssh kesavan@10.4.0.6 'kubectl set image deployment/claim-ms claim-ms=ghcr.io/sunbird-rc/sunbird-rc-claim-ms:${env.BUILD_NUMBER} --record --namespace=ndear'"
 //         }
 
     }
diff --git a/Makefile b/Makefile
index f321d634f..eec8b8f80 100644
--- a/Makefile
+++ b/Makefile
@@ -2,14 +2,14 @@
 rwildcard=$(wildcard $1$2) $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2))
 SOURCES := $(call rwildcard,java/,*.java)
 RELEASE_VERSION = v0.0.14
-IMAGES := dockerhub/sunbird-rc-core dockerhub/sunbird-rc-nginx dockerhub/sunbird-rc-context-proxy-service \
-			dockerhub/sunbird-rc-public-key-service dockerhub/sunbird-rc-keycloak dockerhub/sunbird-rc-certificate-api \
-			dockerhub/sunbird-rc-certificate-signer dockerhub/sunbird-rc-notification-service dockerhub/sunbird-rc-claim-ms \
-			dockerhub/sunbird-rc-digilocker-certificate-api dockerhub/sunbird-rc-bulk-issuance dockerhub/sunbird-rc-metrics
+IMAGES := ghcr.io/sunbird-rc/sunbird-rc-core ghcr.io/sunbird-rc/sunbird-rc-nginx ghcr.io/sunbird-rc/sunbird-rc-context-proxy-service \
+			ghcr.io/sunbird-rc/sunbird-rc-public-key-service ghcr.io/sunbird-rc/sunbird-rc-keycloak ghcr.io/sunbird-rc/sunbird-rc-certificate-api \
+			ghcr.io/sunbird-rc/sunbird-rc-certificate-signer ghcr.io/sunbird-rc/sunbird-rc-notification-service ghcr.io/sunbird-rc/sunbird-rc-claim-ms \
+			ghcr.io/sunbird-rc/sunbird-rc-digilocker-certificate-api ghcr.io/sunbird-rc/sunbird-rc-bulk-issuance ghcr.io/sunbird-rc/sunbird-rc-metrics
 build: java/registry/target/registry.jar
 	echo ${SOURCES}
 	rm -rf java/claim/target/*.jar
-	cd target && rm -rf * && jar xvf ../java/registry/target/registry.jar && cp ../java/Dockerfile ./ && docker build -t dockerhub/sunbird-rc-core .
+	cd target && rm -rf * && jar xvf ../java/registry/target/registry.jar && cp ../java/Dockerfile ./ && docker build -t ghcr.io/sunbird-rc/sunbird-rc-core .
 	make -C java/claim
 	make -C services/certificate-api docker
 	make -C services/certificate-signer docker
@@ -20,7 +20,7 @@ build: java/registry/target/registry.jar
 	make -C services/metrics docker
 	make -C services/digilocker-certificate-api docker
 	make -C services/bulk_issuance docker
-	docker build -t dockerhub/sunbird-rc-nginx .
+	docker build -t ghcr.io/sunbird-rc/sunbird-rc-nginx .
 
 java/registry/target/registry.jar: $(SOURCES)
 	echo $(SOURCES)
diff --git a/deps/keycloak/Makefile b/deps/keycloak/Makefile
index 467846712..defe22104 100644
--- a/deps/keycloak/Makefile
+++ b/deps/keycloak/Makefile
@@ -3,7 +3,7 @@
 build:
 	echo "Building docker image"
 	@cd ../keycloak-mobile-number-login-spi/ && sh ./build.sh
-	@docker build -t dockerhub/sunbird-rc-keycloak .
+	@docker build -t ghcr.io/sunbird-rc/sunbird-rc-keycloak .
 
 push:
-	@docker push dockerhub/sunbird-rc-keycloak
+	@docker push ghcr.io/sunbird-rc/sunbird-rc-keycloak
diff --git a/deps/keycloak/docker-compose.yml b/deps/keycloak/docker-compose.yml
index c3664db9c..11f233bfd 100644
--- a/deps/keycloak/docker-compose.yml
+++ b/deps/keycloak/docker-compose.yml
@@ -8,7 +8,7 @@ services:
       - POSTGRES_USER=keycloak
       - POSTGRES_PASSWORD=keycloak
   keycloak:
-    image: dockerhub/keycloak
+    image: ghcr.io/sunbird-rc/keycloak
 #    build:
 #      .
     environment:
diff --git a/docker-compose.yml b/docker-compose.yml
index 4e5991154..531719bb8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,7 +32,7 @@ services:
       timeout: 5s
       retries: 5
   registry:
-    image: dockerhub/sunbird-rc-core:${RELEASE_VERSION}
+    image: ghcr.io/sunbird-rc/sunbird-rc-core:${RELEASE_VERSION}
     volumes:
       - ./${SCHEMA_DIR-java/registry/src/main/resources/public/_schemas}:/home/sunbirdrc/config/public/_schemas
       - ./${VIEW_DIR-java/registry/src/main/resources/views}:/home/sunbirdrc/config/views/
@@ -99,7 +99,7 @@ services:
       timeout: 10s
       retries: 10
   keycloak:
-    image: dockerhub/sunbird-rc-keycloak:latest
+    image: ghcr.io/sunbird-rc/sunbird-rc-keycloak:latest
     volumes:
       - ./${KEYCLOAK_IMPORT_DIR-imports}:/opt/jboss/keycloak/imports
     environment:
@@ -127,7 +127,7 @@ services:
       db:
         condition: service_healthy
   claim-ms:
-    image: dockerhub/sunbird-rc-claim-ms:${RELEASE_VERSION}
+    image: ghcr.io/sunbird-rc/sunbird-rc-claim-ms:${RELEASE_VERSION}
     environment:
       - connectionInfo_uri=jdbc:postgresql://db:5432/registry
       - connectionInfo_username=postgres
@@ -146,7 +146,7 @@ services:
       timeout: 10s
       retries: 10
   certificate-signer:
-    image: dockerhub/sunbird-rc-certificate-signer:${RELEASE_VERSION}
+    image: ghcr.io/sunbird-rc/sunbird-rc-certificate-signer:${RELEASE_VERSION}
     environment:
       - PORT=8079
       - TIME_ZONE=Asia/Kolkata
@@ -161,7 +161,7 @@ services:
       timeout: 10s
       retries: 10
   certificate-api:
-    image: dockerhub/sunbird-rc-certificate-api:${RELEASE_VERSION}
+    image: ghcr.io/sunbird-rc/sunbird-rc-certificate-api:${RELEASE_VERSION}
     environment:
       - PORT=8078
     ports:
@@ -189,7 +189,7 @@ services:
       timeout: 20s
       retries: 10
   notification-ms:
-    image: dockerhub/sunbird-rc-notification-service:${RELEASE_VERSION}
+    image: ghcr.io/sunbird-rc/sunbird-rc-notification-service:${RELEASE_VERSION}
     ports:
       - "8765:8765"
     healthcheck:
@@ -232,7 +232,7 @@ services:
       timeout: 10s
       retries: 10
   public-key-service:
-    image: dockerhub/sunbird-rc-public-key-service
+    image: ghcr.io/sunbird-rc/sunbird-rc-public-key-service
     environment:
       - CONFIG_BASE_PATH=/etc/keys
     ports:
@@ -245,7 +245,7 @@ services:
     volumes:
       - ./imports:/etc/keys
   context-proxy-service:
-    image: dockerhub/sunbird-rc-context-proxy-service
+    image: ghcr.io/sunbird-rc/sunbird-rc-context-proxy-service
     ports:
       - "4400:4400"
     healthcheck:
@@ -254,7 +254,7 @@ services:
       timeout: 10s
       retries: 10
   nginx:
-    image: dockerhub/sunbird-rc-nginx
+    image: ghcr.io/sunbird-rc/sunbird-rc-nginx
     ports:
       - "80:80"
     depends_on:
@@ -276,7 +276,7 @@ services:
       timeout: 10s
       retries: 10
   metrics:
-    image: dockerhub/sunbird-rc-metrics
+    image: ghcr.io/sunbird-rc/sunbird-rc-metrics
     environment:
       CLICK_HOUSE_URL: clickhouse:9000
       CLICKHOUSE_DATABASE: default
@@ -285,12 +285,6 @@ services:
       REDIS_URL: redis:6379
     ports:
       - "8070:8070"
-    healthcheck:
-      test:
-        [ "CMD-SHELL", "wget -nv -t1 --spider http://localhost:8070/health || exit 1" ]
-      interval: 30s
-      timeout: 10s
-      retries: 10
     depends_on:
       kafka:
         condition: service_healthy
@@ -301,7 +295,7 @@ services:
     ports:
       - "6379:6379"
   digilocker-certificate-api:
-    image: dockerhub/sunbird-rc-digilocker-certificate-api
+    image: ghcr.io/sunbird-rc/sunbird-rc-digilocker-certificate-api
     volumes:
       - ./services/digilocker-certificate-api/config/:/go/config/
     ports:
@@ -313,7 +307,7 @@ services:
       DIGILOCKER_AUTH_KEYNAME: x-digilocker-hmac
       PORT: 8087
   bulk_issuance:
-    image: dockerhub/sunbird-rc-bulk-issuance
+    image: ghcr.io/sunbird-rc/sunbird-rc-bulk-issuance
     ports:
       - "5665:5665"
     environment:
diff --git a/dockerPushToRepo.sh b/dockerPushToRepo.sh
index 419d65608..867e7ed38 100755
--- a/dockerPushToRepo.sh
+++ b/dockerPushToRepo.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 cd target && jar -xvf ../java/registry/target/registry.jar && cd -
-docker build -t dockerhub/sunbird-rc .
+docker build -t ghcr.io/sunbird-rc/sunbird-rc .
 
 e () {
     echo $( echo ${1} | jq ".${2}" | sed 's/\"//g')
diff --git a/imports/config.json b/imports/config.json
index 5151928cf..6a3651c0f 100644
--- a/imports/config.json
+++ b/imports/config.json
@@ -1,11 +1,11 @@
 {
-  "issuers": {
-    "default": {
-      "publicKey": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnXQalrgztecTpc+INjRQ8s73FSE1kU5QSlwBdICCVJBUKiuQUt7s+Z5epgCvLVAOCbP1mm5lV7bfgV/iYWDio7lzX4MlJwDedWLiufr3Ajq+79CQiqPaIbZTo0i13zijKtX7wgxQ78wT/HkJRLkFpmGeK3za21tEfttytkhmJYlwaDTEc+Kx3RJqVhVh/dfwJGeuV4Xc/e2NH++ht0ENGuTk44KpQ+pwQVqtW7lmbDZQJoOJ7HYmmoKGJ0qt2hrj15uwcD1WEYfY5N7N0ArTzPgctExtZFDmituLGzuAZfv2AZZ9/7Y+igshzfB0reIFdUKw3cdVTzfv5FNrIqN5pwIDAQAB\n-----END PUBLIC KEY-----\n",
-      "privateKey": "-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAnXQalrgztecTpc+INjRQ8s73FSE1kU5QSlwBdICCVJBUKiuQUt7s+Z5epgCvLVAOCbP1mm5lV7bfgV/iYWDio7lzX4MlJwDedWLiufr3Ajq+79CQiqPaIbZTo0i13zijKtX7wgxQ78wT/HkJRLkFpmGeK3za21tEfttytkhmJYlwaDTEc+Kx3RJqVhVh/dfwJGeuV4Xc/e2NH++ht0ENGuTk44KpQ+pwQVqtW7lmbDZQJoOJ7HYmmoKGJ0qt2hrj15uwcD1WEYfY5N7N0ArTzPgctExtZFDmituLGzuAZfv2AZZ9/7Y+igshzfB0reIFdUKw3cdVTzfv5FNrIqN5pwIDAQABAoIBAHPILMUoLt5UTd5f/YnebqgeCRNAmGOBcwk7HtbMqQoGF93qqvZFd30XOAJZ/ncTpz77Vl95ToxxrWk1WQLCe+ZpOK3Dgk5sFSm8zXx1T64UBNPUSnWoh37C1D39+b9rppCZScgnxlyPdSLy3h3q8Hyoy+auqUEkm/ms5W2lT3fJscyN1IAyHrhsOBWjl3Ilq5GxBo5tbYv/Fb1pQiP/p2SIHA1+2ASXNYQP100F5Vn0V6SFtBXTCQnwcvbP083NvlGxs9+xRs3MCUcxCkKepWuzYwOZDmu/2yCz1/EsP6wlsYEHmCZLdIb0tQt0caqzB/RoxfBpNRIlhOtqHvBzUgECgYEAzIRn5Y7lqO3N+V29wXXtVZjYWvBh7xUfOxAwVYv0rKI0y9kHJHhIrU+wOVOKGISxBKmzqBQRPvXtXW8E0/14Zz82g60rRwtNjvW0UoZAY3KPouwruUIjAe2UnKZcQ//MBTrvds8QGpL6nxvPsBqU0y2K+ySAOxBtNtGEjzv8nxUCgYEAxRbMWukIbgVOuQjangkfJEfA1UaRFQqQ8jUmT9aiq2nREnd4mYP8kNKzJa9L7zj6Un6yLH5DbGspZ2gGODeRw3uVFN8XSzRdLvllNEyiG/waiysUtXfG2DPOR6xD8tXXDMm/tl9gTa8cbkvqYy10XT9MpfOAsusEZVmc0/DBBMsCgYAYdAxoKjnThPuHwWma5BrIjUnxNaTADWp6iWj+EYnjylE9vmlYNvmZn1mWwSJV5Ce2QwQ0KJIXURhcf5W4MypeTfSase3mxLc1TLOO2naAbYY3GL3xnLLK3DlUsZ9+kes3BOD097UZOFG3DIA8sjDxPxTLCoY6ibBFSa/r4GRIMQKBgQCranDCgPu79RHLDVBXM0fKnj2xQXbd/hqjDmcL+Xnx7E7S6OYTXyBENX1qwVQh9ESDi34cBJVPrsSME4WVT3+PreS0CnSQDDMfr/m9ywkTnejYMdgJHOvtDuHSpJlUk3g+vxnm3H0+E5d+trhdGiOjFnLrwyWkd5OTMqWcEEFQkQKBgFfXObDz/7KqeSaAxI8RzXWbI3Fa492b4qQUhbKYVpGn98CCVEFJr11vuB/8AXYCa92OtbwgMw6Ah5JOGzRScJKdipoxo7oc2LJ9sSjjw3RB/aWl35ChvnCJhmfSL8Usbj0nWVTrPwRLjMC2bIxkLtnm9qYXPumW1EjEbusjVMpN\n-----END RSA PRIVATE KEY-----\n",
-      "signatureType": "RSA",
-      "verificationMethod": "did:india",
-      "$comment": "The above are test keys and it needs to be replaced before going to production"
-    }
-  }
+	"issuers": {
+		"default": {
+			"publicKey": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnXQalrgztecTpc+INjRQ8s73FSE1kU5QSlwBdICCVJBUKiuQUt7s+Z5epgCvLVAOCbP1mm5lV7bfgV/iYWDio7lzX4MlJwDedWLiufr3Ajq+79CQiqPaIbZTo0i13zijKtX7wgxQ78wT/HkJRLkFpmGeK3za21tEfttytkhmJYlwaDTEc+Kx3RJqVhVh/dfwJGeuV4Xc/e2NH++ht0ENGuTk44KpQ+pwQVqtW7lmbDZQJoOJ7HYmmoKGJ0qt2hrj15uwcD1WEYfY5N7N0ArTzPgctExtZFDmituLGzuAZfv2AZZ9/7Y+igshzfB0reIFdUKw3cdVTzfv5FNrIqN5pwIDAQAB\n-----END PUBLIC KEY-----\n",
+			"privateKey": "-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAnXQalrgztecTpc+INjRQ8s73FSE1kU5QSlwBdICCVJBUKiuQUt7s+Z5epgCvLVAOCbP1mm5lV7bfgV/iYWDio7lzX4MlJwDedWLiufr3Ajq+79CQiqPaIbZTo0i13zijKtX7wgxQ78wT/HkJRLkFpmGeK3za21tEfttytkhmJYlwaDTEc+Kx3RJqVhVh/dfwJGeuV4Xc/e2NH++ht0ENGuTk44KpQ+pwQVqtW7lmbDZQJoOJ7HYmmoKGJ0qt2hrj15uwcD1WEYfY5N7N0ArTzPgctExtZFDmituLGzuAZfv2AZZ9/7Y+igshzfB0reIFdUKw3cdVTzfv5FNrIqN5pwIDAQABAoIBAHPILMUoLt5UTd5f/YnebqgeCRNAmGOBcwk7HtbMqQoGF93qqvZFd30XOAJZ/ncTpz77Vl95ToxxrWk1WQLCe+ZpOK3Dgk5sFSm8zXx1T64UBNPUSnWoh37C1D39+b9rppCZScgnxlyPdSLy3h3q8Hyoy+auqUEkm/ms5W2lT3fJscyN1IAyHrhsOBWjl3Ilq5GxBo5tbYv/Fb1pQiP/p2SIHA1+2ASXNYQP100F5Vn0V6SFtBXTCQnwcvbP083NvlGxs9+xRs3MCUcxCkKepWuzYwOZDmu/2yCz1/EsP6wlsYEHmCZLdIb0tQt0caqzB/RoxfBpNRIlhOtqHvBzUgECgYEAzIRn5Y7lqO3N+V29wXXtVZjYWvBh7xUfOxAwVYv0rKI0y9kHJHhIrU+wOVOKGISxBKmzqBQRPvXtXW8E0/14Zz82g60rRwtNjvW0UoZAY3KPouwruUIjAe2UnKZcQ//MBTrvds8QGpL6nxvPsBqU0y2K+ySAOxBtNtGEjzv8nxUCgYEAxRbMWukIbgVOuQjangkfJEfA1UaRFQqQ8jUmT9aiq2nREnd4mYP8kNKzJa9L7zj6Un6yLH5DbGspZ2gGODeRw3uVFN8XSzRdLvllNEyiG/waiysUtXfG2DPOR6xD8tXXDMm/tl9gTa8cbkvqYy10XT9MpfOAsusEZVmc0/DBBMsCgYAYdAxoKjnThPuHwWma5BrIjUnxNaTADWp6iWj+EYnjylE9vmlYNvmZn1mWwSJV5Ce2QwQ0KJIXURhcf5W4MypeTfSase3mxLc1TLOO2naAbYY3GL3xnLLK3DlUsZ9+kes3BOD097UZOFG3DIA8sjDxPxTLCoY6ibBFSa/r4GRIMQKBgQCranDCgPu79RHLDVBXM0fKnj2xQXbd/hqjDmcL+Xnx7E7S6OYTXyBENX1qwVQh9ESDi34cBJVPrsSME4WVT3+PreS0CnSQDDMfr/m9ywkTnejYMdgJHOvtDuHSpJlUk3g+vxnm3H0+E5d+trhdGiOjFnLrwyWkd5OTMqWcEEFQkQKBgFfXObDz/7KqeSaAxI8RzXWbI3Fa492b4qQUhbKYVpGn98CCVEFJr11vuB/8AXYCa92OtbwgMw6Ah5JOGzRScJKdipoxo7oc2LJ9sSjjw3RB/aWl35ChvnCJhmfSL8Usbj0nWVTrPwRLjMC2bIxkLtnm9qYXPumW1EjEbusjVMpN\n-----END RSA PRIVATE KEY-----\n",
+			"signatureType": "RSA",
+			"verificationMethod": "did:india",
+			"$comment": "The above are test keys and it needs to be replaced before going to production"
+		}
+	}
 }
\ No newline at end of file
diff --git a/infra/helm_charts/charts/certificate-api/values.yaml b/infra/helm_charts/charts/certificate-api/values.yaml
index 2381d27cb..a67d297cd 100644
--- a/infra/helm_charts/charts/certificate-api/values.yaml
+++ b/infra/helm_charts/charts/certificate-api/values.yaml
@@ -5,7 +5,7 @@
 replicaCount: 1
 
 image:
-  repository: dockerhub/sunbird-rc-certificate-api
+  repository: ghcr.io/sunbird-rc/sunbird-rc-certificate-api
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
diff --git a/infra/helm_charts/charts/certificate-signer/values.yaml b/infra/helm_charts/charts/certificate-signer/values.yaml
index 8085b7c05..25abcd1de 100644
--- a/infra/helm_charts/charts/certificate-signer/values.yaml
+++ b/infra/helm_charts/charts/certificate-signer/values.yaml
@@ -5,7 +5,7 @@
 replicaCount: 1
 
 image:
-  repository: dockerhub/sunbird-rc-certificate-signer
+  repository: ghcr.io/sunbird-rc/sunbird-rc-certificate-signer
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
diff --git a/infra/helm_charts/charts/claim-ms/values.yaml b/infra/helm_charts/charts/claim-ms/values.yaml
index e08efec17..f9172932b 100644
--- a/infra/helm_charts/charts/claim-ms/values.yaml
+++ b/infra/helm_charts/charts/claim-ms/values.yaml
@@ -5,7 +5,7 @@
 replicaCount: 1
 
 image:
-  repository: dockerhub/sunbird-rc-claim-ms
+  repository: ghcr.io/sunbird-rc/sunbird-rc-claim-ms
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
diff --git a/infra/helm_charts/charts/context-proxy-service/values.yaml b/infra/helm_charts/charts/context-proxy-service/values.yaml
index 9fa9b7ac4..04c3bcfda 100644
--- a/infra/helm_charts/charts/context-proxy-service/values.yaml
+++ b/infra/helm_charts/charts/context-proxy-service/values.yaml
@@ -5,7 +5,7 @@
 replicaCount: 1
 
 image:
-  repository: dockerhub/sunbird-rc-context-proxy-service
+  repository: ghcr.io/sunbird-rc/sunbird-rc-context-proxy-service
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
diff --git a/infra/helm_charts/charts/keycloak-service/values.yaml b/infra/helm_charts/charts/keycloak-service/values.yaml
index a31a742c3..67046f017 100644
--- a/infra/helm_charts/charts/keycloak-service/values.yaml
+++ b/infra/helm_charts/charts/keycloak-service/values.yaml
@@ -5,7 +5,7 @@
 replicaCount: 1
 
 image:
-  repository: dockerhub/sunbird-rc-keycloak
+  repository: ghcr.io/sunbird-rc/sunbird-rc-keycloak
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
diff --git a/infra/helm_charts/charts/notification-ms/values.yaml b/infra/helm_charts/charts/notification-ms/values.yaml
index 8e1a1628a..0d635844c 100644
--- a/infra/helm_charts/charts/notification-ms/values.yaml
+++ b/infra/helm_charts/charts/notification-ms/values.yaml
@@ -5,7 +5,7 @@
 replicaCount: 1
 
 image:
-  repository: dockerhub/sunbird-rc-notification-service
+  repository: ghcr.io/sunbird-rc/sunbird-rc-notification-service
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
diff --git a/infra/helm_charts/charts/public-key-service/values.yaml b/infra/helm_charts/charts/public-key-service/values.yaml
index 89eb7c116..81e23f2c4 100644
--- a/infra/helm_charts/charts/public-key-service/values.yaml
+++ b/infra/helm_charts/charts/public-key-service/values.yaml
@@ -5,7 +5,7 @@
 replicaCount: 1
 
 image:
-  repository: dockerhub/sunbird-rc-public-key-service
+  repository: ghcr.io/sunbird-rc/sunbird-rc-public-key-service
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
diff --git a/infra/helm_charts/charts/registry/schemas/Student.json b/infra/helm_charts/charts/registry/schemas/Student.json
deleted file mode 100644
index 47d20d6b6..000000000
--- a/infra/helm_charts/charts/registry/schemas/Student.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema",
-  "type": "object",
-  "properties": {
-    "Student": {
-      "$ref": "#/definitions/Student"
-    }
-  },
-  "required": [
-    "Student"
-  ],
-  "title":"Student",
-  "definitions": {
-    "Student": {
-      "$id": "#/properties/Student",
-      "type": "object",
-      "title": "The Student Schema",
-      "required": [
-
-      ],
-      "properties": {
-        "name": {
-          "type": "string"
-        }
-      }
-    }
-  },
-  "_osConfig": {
-    "osComment": ["This section contains the OpenSABER specific configuration information",
-      "privateFields: Optional; list of field names to be encrypted and stored in database",
-      "signedFields: Optional; list of field names that must be pre-signed",
-      "indexFields: Optional; list of field names used for creating index. Enclose within braces to indicate it is a composite index. In this definition, (serialNum, studentCode) is a composite index and studentName is a single column index.",
-      "uniqueIndexFields: Optional; list of field names used for creating unique index. Field names must be different from index field name",
-      "systemFields: Optional; list of fields names used for system standard information like created, updated timestamps and userid"],
-
-    "privateFields": [
-      "$.identityDetails.dob",
-      "$.identityDetails.identityType",
-      "$.identityDetails.identityValue",
-      "$.contactDetails.email",
-      "$.contactDetails.mobile",
-      "$.contactDetails.address.plot",
-      "$.contactDetails.address.street",
-      "$.contactDetails.address.landmark",
-      "$.contactDetails.address.locality"
-    ],
-    "indexFields": ["studentName"],
-    "uniqueIndexFields": ["identityValue"],
-    "systemFields": [
-      "osCreatedAt",
-      "osUpdatedAt",
-      "osCreatedBy",
-      "osUpdatedBy"
-    ],
-    "attestationPolicies": [
-      {
-        "name": "studentInstituteAttest",
-        "additionalInput": {
-          "enrollmentNumber": {"type": "string"}
-        },
-        "attestationProperties": {
-          "name": "$.identityDetails.fullName",
-          "educationDetails": "$.educationDetails"
-        },
-        "type": "MANUAL",
-        "conditions": "(ATTESTOR#$.experience.[*].instituteOSID#.contains(REQUESTER#$.educationDetails.*.instituteOSID#))",
-        "attestorPlugin": "did:internal:ClaimPluginActor?entity=Teacher"
-      }
-    ],
-    "inviteRoles":["Teacher"],
-    "ownershipAttributes": [
-      {
-        "email": "/contactDetails/email",
-        "mobile": "/contactDetails/mobile",
-        "userId": "/contactDetails/mobile"
-      }
-    ]
-  }
-}
diff --git a/infra/helm_charts/charts/registry/values.yaml b/infra/helm_charts/charts/registry/values.yaml
index 6805d890a..973a93028 100644
--- a/infra/helm_charts/charts/registry/values.yaml
+++ b/infra/helm_charts/charts/registry/values.yaml
@@ -3,9 +3,9 @@
 # Declare variables to be passed into your templates.
 
 replicaCount: 1
-
+host: loadtesting.xiv.in
 image:
-  repository: dockerhub/sunbird-rc-core
+  repository: ghcr.io/sunbird-rc/sunbird-rc-core
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
diff --git a/java/claim/Makefile b/java/claim/Makefile
index 832b98e14..9eb60e04d 100644
--- a/java/claim/Makefile
+++ b/java/claim/Makefile
@@ -5,7 +5,7 @@ rwildcard=$(wildcard $1$2) $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2))
 SOURCES := $(call rwildcard,java/,*.java)
 build: target/claim-0.0.1-SNAPSHOT.jar
 	echo ${SOURCES}
-	cd target && docker build -t dockerhub/sunbird-rc-claim-ms ..
+	cd target && docker build -t ghcr.io/sunbird-rc/sunbird-rc-claim-ms ..
 
 target/claim-0.0.1-SNAPSHOT.jar: $(SOURCES)
 	echo $(SOURCES)
diff --git a/services/bulk_issuance/Makefile b/services/bulk_issuance/Makefile
index 7d495dec4..2048e272c 100644
--- a/services/bulk_issuance/Makefile
+++ b/services/bulk_issuance/Makefile
@@ -1,7 +1,7 @@
 SPEC_FILE := ./interfaces/bulk_issuance_api.yaml
 GOPATH := $(shell go env GOPATH)
 source := $(wildcard *.go **/*.go */*/*.go)
-IMAGE := dockerhub/sunbird-rc-bulk-issuance
+IMAGE := ghcr.io/sunbird-rc/sunbird-rc-bulk-issuance
 all: bulk_issuance-server
 
 deps:
diff --git a/services/certificate-api/Makefile b/services/certificate-api/Makefile
index ce6a7d1f1..d07ab271f 100644
--- a/services/certificate-api/Makefile
+++ b/services/certificate-api/Makefile
@@ -1,5 +1,5 @@
 
-IMAGE:=dockerhub/sunbird-rc-certificate-api
+IMAGE:=ghcr.io/sunbird-rc/sunbird-rc-certificate-api
 
 docker:
 	@docker build -t $(IMAGE) .
diff --git a/services/certificate-signer/Makefile b/services/certificate-signer/Makefile
index 110b42a90..32100399a 100644
--- a/services/certificate-signer/Makefile
+++ b/services/certificate-signer/Makefile
@@ -1,5 +1,5 @@
 
-IMAGE:=dockerhub/sunbird-rc-certificate-signer
+IMAGE:=ghcr.io/sunbird-rc/sunbird-rc-certificate-signer
 
 test: docker
 	@docker-compose -f api-test-docker-compose.yml up -d
diff --git a/services/certificate-signer/api-test-docker-compose.yml b/services/certificate-signer/api-test-docker-compose.yml
index f0bd76105..28edc9eed 100644
--- a/services/certificate-signer/api-test-docker-compose.yml
+++ b/services/certificate-signer/api-test-docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3.3"
 services:
   certificate-signer:
-    image: docker.io/dockerhub/sunbird-rc-certificate-signer
+    image: ghcr.io/sunbird-rc/sunbird-rc-certificate-signer
     environment:
       - CONFIG_BASE_PATH=/etc/signer
     ports:
@@ -14,7 +14,7 @@ services:
     volumes:
       - ./tests/config:/etc/signer
   test-runner:
-    image: dockerhub/python-papermill
+    image: ghcr.io/sunbird-rc/python-papermill
     command:
       - "/usr/local/bin/papermill"
       - "--log-output"
diff --git a/services/context-proxy-service/Makefile b/services/context-proxy-service/Makefile
index 0aed0582a..e95d673e7 100644
--- a/services/context-proxy-service/Makefile
+++ b/services/context-proxy-service/Makefile
@@ -1,5 +1,5 @@
 
-IMAGE:=dockerhub/sunbird-rc-context-proxy-service
+IMAGE:=ghcr.io/sunbird-rc/sunbird-rc-context-proxy-service
 
 test: docker
 	@docker-compose -f api-test-docker-compose.yml up -d context-proxy-service
diff --git a/services/context-proxy-service/api-test-docker-compose.yml b/services/context-proxy-service/api-test-docker-compose.yml
index d1b8bc6d3..1b348216a 100644
--- a/services/context-proxy-service/api-test-docker-compose.yml
+++ b/services/context-proxy-service/api-test-docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3.3"
 services:
   context-proxy-service:
-    image: dockerhub/sunbird-rc-context-proxy-service
+    image: ghcr.io/sunbird-rc/sunbird-rc-context-proxy-service
     ports:
       - "4400:4400"
     healthcheck:
@@ -10,7 +10,7 @@ services:
       timeout: 10s
       retries: 4
   test-runner:
-    image: dockerhub/python-papermill
+    image: ghcr.io/sunbird-rc/python-papermill
     command:
       - "/usr/local/bin/papermill"
       - "--log-output"
diff --git a/services/digilocker-certificate-api/Makefile b/services/digilocker-certificate-api/Makefile
index 1f17f8124..c96d46842 100644
--- a/services/digilocker-certificate-api/Makefile
+++ b/services/digilocker-certificate-api/Makefile
@@ -1,4 +1,4 @@
-IMAGE:=dockerhub/sunbird-rc-digilocker-certificate-api
+IMAGE:=ghcr.io/sunbird-rc/sunbird-rc-digilocker-certificate-api
 
 docker:
 	@docker build -t $(IMAGE) .
diff --git a/services/metrics/Makefile b/services/metrics/Makefile
index 7f5321e47..22eded014 100644
--- a/services/metrics/Makefile
+++ b/services/metrics/Makefile
@@ -1,4 +1,4 @@
-IMAGE:=dockerhub/sunbird-rc-metrics
+IMAGE:=ghcr.io/sunbird-rc/sunbird-rc-metrics
 SPEC_FILE := interfaces/metrics-api.yaml
 GOPATH := $(shell go env GOPATH)
 source := $(wildcard *.go **/*.go */*/*.go)
diff --git a/services/notification-service/Makefile b/services/notification-service/Makefile
index 49afac464..9ac515281 100644
--- a/services/notification-service/Makefile
+++ b/services/notification-service/Makefile
@@ -41,4 +41,4 @@ run: ./notification-service
 	./notification-service --scheme http --port 8765
 
 docker:
-	docker build -t dockerhub/sunbird-rc-notification-service .
+	docker build -t ghcr.io/sunbird-rc/sunbird-rc-notification-service .
diff --git a/services/public-key-service/Makefile b/services/public-key-service/Makefile
index cd42a5b4b..b5a58ba98 100644
--- a/services/public-key-service/Makefile
+++ b/services/public-key-service/Makefile
@@ -1,5 +1,5 @@
 
-IMAGE:=dockerhub/sunbird-rc-public-key-service
+IMAGE:=ghcr.io/sunbird-rc/sunbird-rc-public-key-service
 
 test: docker
 	@docker-compose -f api-test-docker-compose.yml up -d
diff --git a/services/public-key-service/api-test-docker-compose.yml b/services/public-key-service/api-test-docker-compose.yml
index 2f27d5530..48fa39e75 100644
--- a/services/public-key-service/api-test-docker-compose.yml
+++ b/services/public-key-service/api-test-docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3.3"
 services:
   public-keys-service:
-    image: dockerhub/sunbird-rc-public-key-service
+    image: ghcr.io/sunbird-rc/sunbird-rc-public-key-service
     environment:
       - CONFIG_BASE_PATH=/etc/keys
     ports:
@@ -14,7 +14,7 @@ services:
     volumes:
       - ./tests/config:/etc/keys
   test-runner:
-    image: dockerhub/python-papermill
+    image: ghcr.io/sunbird-rc/python-papermill
     command:
       - "/usr/local/bin/papermill"
       - "--log-output"
diff --git a/tools/cli/src/templates/.env b/tools/cli/src/templates/.env
deleted file mode 120000
index 8023cca10..000000000
--- a/tools/cli/src/templates/.env
+++ /dev/null
@@ -1 +0,0 @@
-../../../../.env
\ No newline at end of file
diff --git a/tools/cli/src/templates/.env b/tools/cli/src/templates/.env
new file mode 100644
index 000000000..8023cca10
--- /dev/null
+++ b/tools/cli/src/templates/.env
@@ -0,0 +1 @@
+../../../../.env
\ No newline at end of file
diff --git a/tools/cli/src/templates/config.json b/tools/cli/src/templates/config.json
deleted file mode 120000
index 98e9995de..000000000
--- a/tools/cli/src/templates/config.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../imports/config.json
\ No newline at end of file
diff --git a/tools/cli/src/templates/config.json b/tools/cli/src/templates/config.json
new file mode 100644
index 000000000..98e9995de
--- /dev/null
+++ b/tools/cli/src/templates/config.json
@@ -0,0 +1 @@
+../../../../imports/config.json
\ No newline at end of file
diff --git a/tools/cli/src/templates/docker-compose.yml b/tools/cli/src/templates/docker-compose.yml
deleted file mode 120000
index b4d69e1fc..000000000
--- a/tools/cli/src/templates/docker-compose.yml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../docker-compose.yml
\ No newline at end of file
diff --git a/tools/cli/src/templates/docker-compose.yml b/tools/cli/src/templates/docker-compose.yml
new file mode 100644
index 000000000..b4d69e1fc
--- /dev/null
+++ b/tools/cli/src/templates/docker-compose.yml
@@ -0,0 +1 @@
+../../../../docker-compose.yml
\ No newline at end of file