diff --git a/Amazon/cloudformation-modules/JFrog__Artifactory__ExistingVpc__MODULE/fragments/jfrog-artifactory-ec2-existing-vpc.template.yaml b/Amazon/cloudformation-modules/JFrog__Artifactory__ExistingVpc__MODULE/fragments/jfrog-artifactory-ec2-existing-vpc.template.yaml
index 90fd3ac..e7e5e77 100644
--- a/Amazon/cloudformation-modules/JFrog__Artifactory__ExistingVpc__MODULE/fragments/jfrog-artifactory-ec2-existing-vpc.template.yaml
+++ b/Amazon/cloudformation-modules/JFrog__Artifactory__ExistingVpc__MODULE/fragments/jfrog-artifactory-ec2-existing-vpc.template.yaml
@@ -197,7 +197,7 @@ Parameters:
       https://www.jfrog.com/confluence/display/RTF/Release+Notes.
     AllowedPattern: ^(([0-9]|[1-9][0-9])\.){2}([1-9][0-9]|[0-9])$
     ConstraintDescription: A version that matches X.X.X per Artifactory releases
-    Default: 7.17.5
+    Default: 7.21.5
     Type: String
   SmLicenseName:
     Description: Secret name created in AWS Secrets Manager, which contains the Artifactory licenses.
@@ -335,7 +335,7 @@ Parameters:
     Description: The version of Xray that you want to deploy into the Quick Start.
     AllowedPattern: ^(([0-9]|[1-9][0-9])\.){2}([1-9][0-9]|[0-9])$
     ConstraintDescription: A version that matches X.X.X per Xray releases.
-    Default: 3.22.1
+    Default: 3.27.3
     Type: String
   XrayNumberOfInstances:
     Description: The number of Xray instances servers to complete your
diff --git a/Amazon/cloudformation-modules/JFrog__Artifactory__NewVpc__MODULE/fragments/jfrog-artifactory-ec2-master.template.yaml b/Amazon/cloudformation-modules/JFrog__Artifactory__NewVpc__MODULE/fragments/jfrog-artifactory-ec2-master.template.yaml
index c930c61..6bf81ee 100644
--- a/Amazon/cloudformation-modules/JFrog__Artifactory__NewVpc__MODULE/fragments/jfrog-artifactory-ec2-master.template.yaml
+++ b/Amazon/cloudformation-modules/JFrog__Artifactory__NewVpc__MODULE/fragments/jfrog-artifactory-ec2-master.template.yaml
@@ -187,7 +187,7 @@ Parameters:
     Description: Version of Artifactory that you want to deploy into the Quick Start.
       To select the correct version, see the release notes at
       https://www.jfrog.com/confluence/display/RTF/Release+Notes.
-    Default: 7.17.5
+    Default: 7.21.5
     Type: String
   SmLicenseName:
     Description: Secret name created in AWS Secrets Manager, which contains the Artifactory licenses.
@@ -324,7 +324,7 @@ Parameters:
     Type: String
   XrayVersion:
     Description: The version of Xray that you want to deploy into the Quick Start.
-    Default: 3.22.1
+    Default: 3.27.3
     Type: String
   XrayNumberOfInstances:
     Description: The number of Xray instances servers to complete your
diff --git a/Amazon/cloudformation-modules/test-cfts/README.MD b/Amazon/cloudformation-modules/test-cfts/README.MD
index 1b9c521..0b55c8b 100644
--- a/Amazon/cloudformation-modules/test-cfts/README.MD
+++ b/Amazon/cloudformation-modules/test-cfts/README.MD
@@ -1,15 +1,8 @@
 # Taskcat commands
 
+```
+taskcat test run -n -l -t new-vpc
+```
 ```
 taskcat test run -n -l -t existing-vpc
 ```
-
-# CFN commands
-
-```
-cfn submit
-```
-
-```
-aws cloudformation set-type-default-version --type-name JFrog::Artifactory::NewVpc::MODULE --version-id 00000010 --type MODULE
-```
\ No newline at end of file
diff --git a/Amazon/cloudformation-modules/test-cfts/register.sh b/Amazon/cloudformation-modules/test-cfts/register.sh
index 0debf40..ce21256 100644
--- a/Amazon/cloudformation-modules/test-cfts/register.sh
+++ b/Amazon/cloudformation-modules/test-cfts/register.sh
@@ -9,8 +9,8 @@ set -ex
 # following commands are needed only one time per account per region
 
 # all_regions=( us-east-1 us-east-2 us-west-1 us-west-2 sa-east-1 ca-central-1 af-south-1 eu-central-1 eu-west-1 eu-west-2 eu-south-1 eu-west-3 eu-north-1 ap-northeast-3 ap-northeast-2 ap-northeast-1 ap-south-1 ap-southeast-1 ap-southeast-2 )
-#  fails in following regions -> af-south-1 eu-central-1 eu-south-1 
-regions=( eu-west-2 eu-south-1 eu-west-3 eu-north-1 ap-northeast-3 ap-northeast-2 ap-northeast-1 ap-south-1 ap-southeast-1 ap-southeast-2 )
+#  fails in following regions -> af-south-1 eu-central-1 eu-south-1
+regions=( us-east-1 us-east-2 us-west-1 us-west-2 sa-east-1 ca-central-1 af-south-1 eu-central-1 eu-west-1 eu-west-2 eu-south-1 eu-west-3 eu-north-1 ap-northeast-3 ap-northeast-2 ap-northeast-1 ap-south-1 ap-southeast-1 ap-southeast-2 )
 PROFILE=seller
 
 # 1) create appropriate profile in ~/.aws/credentials file
diff --git a/Amazon/cloudformation-modules/test-cfts/submit.sh b/Amazon/cloudformation-modules/test-cfts/submit.sh
index 1e0eea3..4f03d2c 100644
--- a/Amazon/cloudformation-modules/test-cfts/submit.sh
+++ b/Amazon/cloudformation-modules/test-cfts/submit.sh
@@ -5,13 +5,16 @@ trap 'last_command=$current_command; current_command=$BASH_COMMAND' DEBUG
 # echo an error message before exiting
 trap 'echo "\"${last_command}\" command filed with exit code $?."' EXIT
 
+
 # list of regions, folder names and corresponding module names
-# 4 regions are not included ap-east-1 (Hong Kong) and me-south-1 (Bahrain), us-gov-east-1, us-gov-west-1
-# 3 regions are supposedly included but since I am not able to register as publisher, modules were not published either af-south-1 eu-south-1 ap-east-1 me-south-1
+# 2 regions where modules are not available: us-gov-east-1, us-gov-west-1
+# 4 regions are opt in so modules were not published: af-south-1 eu-south-1 ap-east-1 me-south-1
 # all_regions=( us-east-1 us-east-2 us-west-1 us-west-2 sa-east-1 ca-central-1 eu-central-1 eu-west-1 eu-west-2 eu-west-3 eu-north-1 ap-northeast-3 ap-northeast-2 ap-northeast-1 ap-south-1 ap-southeast-1 ap-southeast-2 )
-regions=( eu-central-1 eu-west-2 eu-west-3 eu-north-1 ap-northeast-3 ap-northeast-2 ap-northeast-1 ap-south-1 ap-southeast-1 ap-southeast-2 )
-folders=( JFrog-Artifactory-EC2Instance-MODULE JFrog-Xray-EC2Instance-MODULE JFrog__Artifactory__Core__MODULE aws-vpc-module linux-bastion-module JFrog__Artifactory__ExistingVpc__MODULE JFrog__Artifactory__NewVpc__MODULE )
-modules=( JFrog::Artifactory::EC2Instance::MODULE JFrog::Xray::EC2Instance::MODULE JFrog::Artifactory::Core::MODULE JFrog::Vpc::MultiAz::MODULE JFrog::Linux::Bastion::MODULE JFrog::Artifactory::ExistingVpc::MODULE JFrog::Artifactory::NewVpc::MODULE )
+# all_folders=( JFrog-Artifactory-EC2Instance-MODULE JFrog-Xray-EC2Instance-MODULE JFrog__Artifactory__Core__MODULE aws-vpc-module linux-bastion-module JFrog__Artifactory__ExistingVpc__MODULE JFrog__Artifactory__NewVpc__MODULE )
+# all_modules=( JFrog::Artifactory::EC2Instance::MODULE JFrog::Xray::EC2Instance::MODULE JFrog::Artifactory::Core::MODULE JFrog::Vpc::MultiAz::MODULE JFrog::Linux::Bastion::MODULE JFrog::Artifactory::ExistingVpc::MODULE JFrog::Artifactory::NewVpc::MODULE )
+regions=( us-east-1 us-east-2 us-west-1 us-west-2 sa-east-1 ca-central-1 eu-central-1 eu-west-1 eu-west-2 eu-west-3 eu-north-1 ap-northeast-3 ap-northeast-2 ap-northeast-1 ap-south-1 ap-southeast-1 ap-southeast-2 )
+folders=( JFrog__Artifactory__ExistingVpc__MODULE JFrog__Artifactory__NewVpc__MODULE )
+modules=( JFrog::Artifactory::ExistingVpc::MODULE JFrog::Artifactory::NewVpc::MODULE )
 PROFILE=seller
 
 for i in "${!regions[@]}"; do 
@@ -22,7 +25,7 @@ for i in "${!regions[@]}"; do
     export VERSION=$( aws cloudformation list-type-versions --profile $PROFILE --type MODULE --type-name $MODULE --region $REGION | jq .TypeVersionSummaries[-1].VersionId | tr -d "\"")
     printf "1. start        : %s:%s:%s\n" "$REGION" "$MODULE" "$VERSION"
 
-    cd /mnt/c/ddrive/projects/jfrog-modules/$FOLDER
+    cd /mnt/c/ddrive/projects/JFrog-Cloud-Installers/Amazon/cloudformation-modules/$FOLDER
 
     printf "2. submitting   : %s:%s:%s\n" "$REGION" "$MODULE" "$VERSION"
     cfn submit --set-default --region $REGION