diff --git a/README.md b/README.md
index cca2db68f..4d2122a09 100644
--- a/README.md
+++ b/README.md
@@ -12,13 +12,13 @@
 
 The `ocp4-upi-powervs` [project](https://github.com/ocp-power-automation/ocp4-upi-powervs) provides Terraform based automation code to help with the deployment of OpenShift Container Platform (OCP) 4.x on [IBM® Power Systems™ Virtual Server on IBM Cloud](https://www.ibm.com/cloud/power-virtual-server).
 
-This project leverages the helpernode [ansible playbook](https://github.com/RedHatOfficial/ocp4-helpernode) internally for OCP deployment on IBM Power Systems Virtual Servers (PowerVS).
+This project leverages the helpernode [ansible playbook](https://github.com/redhat-cop/ocp4-helpernode) internally for OCP deployment on IBM Power Systems Virtual Servers (PowerVS).
 
 ## Before You Start
-	
-The [main](https://github.com/ocp-power-automation/ocp4-upi-powervs/tree/master) branch must be used with latest OCP pre-release versions only. 
+
+The [main](https://github.com/ocp-power-automation/ocp4-upi-powervs/tree/master) branch must be used with latest OCP pre-release versions only.
 Ensure you checkout the correct `release-VERSION` branch depending on the version (4.5, 4.6 ...) of RedHat OpenShift you want to install:
-	
+
 For example to use OCP 4.8 perform the following
 ```
 export VERSION=4.8
diff --git a/docs/var.tfvars-doc.md b/docs/var.tfvars-doc.md
index d99e69141..41813bbce 100644
--- a/docs/var.tfvars-doc.md
+++ b/docs/var.tfvars-doc.md
@@ -49,9 +49,9 @@ In order to retrieve the PowerVS region, zone and instance specific details plea
    | syd             | syd04          |
    | sao             | sao01          |
    | tor             | tor01          |
-   | tok             | tok04          | 
+   | tok             | tok04          |
    | us-east         | us-east        |
-   
+
    NOTE:  us-east is Washington, DC datacenter.
 
    Tieing all these, the values to be used will be as shown below:
@@ -267,7 +267,7 @@ release_image_override     = ""
 
 These variables specify the ansible playbooks that are used for OpenShift install and post-install customizations.
 ```
-helpernode_repo            = "https://github.com/RedHatOfficial/ocp4-helpernode"
+helpernode_repo            = "https://github.com/redhat-cop/ocp4-helpernode"
 helpernode_tag             = "5eab3db53976bb16be582f2edc2de02f7510050d"
 install_playbook_repo      = "https://github.com/ocp-power-automation/ocp4-playbooks"
 install_playbook_tag       = "02a598faa332aa2c3d53e8edd0e840440ff74bd5"
diff --git a/modules/5_install/variables.tf b/modules/5_install/variables.tf
index 2732c866a..052b74f9d 100644
--- a/modules/5_install/variables.tf
+++ b/modules/5_install/variables.tf
@@ -77,10 +77,10 @@ variable "local_registry_image" {}
 variable "ocp_release_tag" {}
 variable "ocp_release_name" {}
 
-variable "helpernode_repo" { default = "https://github.com/RedHatOfficial/ocp4-helpernode" }
-variable "helpernode_tag" { default = "master" }
+variable "helpernode_repo" { default = "https://github.com/redhat-cop/ocp4-helpernode" }
+variable "helpernode_tag" { default = "main" }
 variable "install_playbook_repo" { default = "https://github.com/ocp-power-automation/ocp4-playbooks" }
-variable "install_playbook_tag" { default = "master" }
+variable "install_playbook_tag" { default = "main" }
 
 variable "storage_type" {}
 variable "log_level" {}
diff --git a/var.tfvars b/var.tfvars
index 96d8c0f9d..c78ec81ff 100644
--- a/var.tfvars
+++ b/var.tfvars
@@ -23,7 +23,7 @@ worker    = { memory = "32", processors = "0.5", "count" = 2 }
 rhel_image_name  = "rhel-8.3"
 rhcos_image_name = "rhcos-4.6"
 
-### Provide these parameters if RHCOS image needs to be imported from public bucket of cloud object storage to PVS. 
+### Provide these parameters if RHCOS image needs to be imported from public bucket of cloud object storage to PVS.
 ### When this is provided, data provided through parameter "rhcos_image_name" will be ignored.
 rhcos_import_image              = false # true/false (default=false).
 rhcos_import_image_filename     = "rhcos-410-84-202201251004-0-ppc64le-powervs.ova.gz"
@@ -74,7 +74,7 @@ use_zone_info_for_names = true # If set it to false, the zone info would not be
 #release_image_override     = ""
 
 
-#helpernode_repo            = "https://github.com/RedHatOfficial/ocp4-helpernode"
+#helpernode_repo            = "https://github.com/redhat-cop/ocp4-helpernode"
 #helpernode_tag             = ""
 #install_playbook_repo      = "https://github.com/ocp-power-automation/ocp4-playbooks"
 #install_playbook_tag       = ""
diff --git a/variables.tf b/variables.tf
index a6049fe93..23f997d78 100644
--- a/variables.tf
+++ b/variables.tf
@@ -289,14 +289,14 @@ variable "installer_log_level" {
 variable "helpernode_repo" {
   type        = string
   description = "Set the repo URL for using ocp4-helpernode"
-  default     = "https://github.com/RedHatOfficial/ocp4-helpernode"
+  default     = "https://github.com/redhat-cop/ocp4-helpernode"
   # Repo for running ocp4 installations steps.
 }
 
 variable "helpernode_tag" {
   type        = string
   description = "Set the branch/tag name or commit# for using ocp4-helpernode repo"
-  default     = "fba129fe20682a466c62a632b0d9a5a863162bcf"
+  default     = "adb1102f64b2f25a8a1b44a96c414f293d72d3fc"
   # Checkout level for var.helpernode_repo which is used for setting up services required on bastion node
 }
 
@@ -624,7 +624,7 @@ variable "csi_driver_version" {
 }
 
 ################################################################
-# Image upload variables (used only for uploading RHCOS image 
+# Image upload variables (used only for uploading RHCOS image
 # from cloud object storage to PowerVS catalog)
 ################################################################
 variable "rhcos_import_image" {