diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
index b4d3c98..0814625 100644
--- a/.github/workflows/terraform.yml
+++ b/.github/workflows/terraform.yml
@@ -47,6 +47,17 @@ jobs:
           actions_subcommand: 'validate'
           tf_actions_working_dir: ./_example/basic_example
 
+      - name: 'Slack Notification'
+        uses: clouddrove/action-slack@v2
+        with:
+          status: ${{ job.status }}
+          fields: repo,author
+          author_name: 'CloudDrove'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # required
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }} # required
+        if: always()
+
   plan:
     name: 'terraform plan'
     runs-on: ubuntu-latest
diff --git a/_example/basic_example/example.tf b/_example/basic_example/example.tf
index d749d69..9b7251c 100644
--- a/_example/basic_example/example.tf
+++ b/_example/basic_example/example.tf
@@ -4,7 +4,7 @@ provider "aws" {
 
 module "vpc" {
   source  = "clouddrove/vpc/aws"
-  version = "0.14.0"
+  version = "0.15.0"
 
   name        = "vpc"
   repository  = "https://registry.terraform.io/modules/clouddrove/vpc/aws/0.14.0"
@@ -15,9 +15,8 @@ module "vpc" {
 }
 
 module "public_subnets" {
-  # source  = "clouddrove/subnet/aws"
-  # version = "0.14.0"
-  source = "git::https://github.com/clouddrove/terraform-aws-subnet.git?ref=0.15"
+  source  = "clouddrove/subnet/aws"
+  version = "0.15.0"
 
   name        = "public-subnet"
   repository  = "https://registry.terraform.io/modules/clouddrove/subnet/aws/0.14.0"
@@ -34,7 +33,7 @@ module "public_subnets" {
 
 module "http-https" {
   source      = "clouddrove/security-group/aws"
-  version     = "0.14.0"
+  version     = "0.15.0"
   name        = "http-https"
   repository  = "https://registry.terraform.io/modules/security-group/ec2/aws/0.14.0"
   environment = "test"
@@ -47,7 +46,7 @@ module "http-https" {
 
 module "ssh" {
   source      = "clouddrove/security-group/aws"
-  version     = "0.14.0"
+  version     = "0.15.0"
   name        = "ssh"
   repository  = "https://registry.terraform.io/modules/clouddrove/security-group/aws/0.14.0"
   environment = "test"
@@ -60,7 +59,7 @@ module "ssh" {
 
 module "iam-role" {
   source  = "clouddrove/iam-role/aws"
-  version = "0.14.0"
+  version = "0.15.0"
 
   name               = "iam-role"
   repository         = "https://registry.terraform.io/modules/clouddrove/iam-role/aws/0.14.0"
@@ -74,7 +73,7 @@ module "iam-role" {
 
 module "kms_key" {
   source                  = "clouddrove/kms/aws"
-  version                 = "0.14.0"
+  version                 = "0.15.0"
   name                    = "kms"
   environment             = "test"
   label_order             = ["environment", "name"]
diff --git a/_example/secure_example/example.tf b/_example/secure_example/example.tf
index 29cb346..cdfa152 100644
--- a/_example/secure_example/example.tf
+++ b/_example/secure_example/example.tf
@@ -4,7 +4,7 @@ provider "aws" {
 
 module "vpc" {
   source  = "clouddrove/vpc/aws"
-  version = "0.14.0"
+  version = "0.15.0"
 
   name        = "vpc"
   environment = "test"
@@ -14,9 +14,8 @@ module "vpc" {
 }
 
 module "public_subnets" {
-  # source  = "clouddrove/subnet/aws"
-  # version = "0.14.0"
-  source = "git::https://github.com/clouddrove/terraform-aws-subnet.git?ref=0.15"
+   source  = "clouddrove/subnet/aws"
+   version = "0.15.0"
 
 
   name        = "public-subnet"
@@ -34,7 +33,7 @@ module "public_subnets" {
 
 module "http-https" {
   source  = "clouddrove/security-group/aws"
-  version = "0.14.0"
+  version = "0.15.0"
 
   name        = "http-https"
   environment = "test"
@@ -47,7 +46,7 @@ module "http-https" {
 
 module "ssh" {
   source  = "clouddrove/security-group/aws"
-  version = "0.14.0"
+  version = "0.15.0"
 
   name        = "ssh"
   environment = "test"
@@ -108,7 +107,7 @@ data "aws_iam_policy_document" "iam-policy" {
 
 module "kms_key" {
   source                  = "clouddrove/kms/aws"
-  version                 = "0.14.0"
+  version                 = "0.15.0"
   name                    = "kms"
   environment             = "test"
   label_order             = ["environment", "name"]
diff --git a/main.tf b/main.tf
index c29d5aa..e451e49 100644
--- a/main.tf
+++ b/main.tf
@@ -7,13 +7,14 @@
 #              tags for resources. You can use terraform-labels to implement a strict
 #              naming convention.
 module "labels" {
-  source = "git::https://github.com/clouddrove/terraform-labels.git?ref=0.15"
+  source  = "clouddrove/labels/aws"
+  version = "0.15.0"
 
   name        = var.name
   repository  = var.repository
   environment = var.environment
-  label_order = var.label_order
   managedby   = var.managedby
+  label_order = var.label_order
 }
 
 locals {