diff --git a/_generator/default/project/definitions/golang/.well-known/README.md b/_generator/default/project/definitions/golang/.well-known/README.md
new file mode 100644
index 0000000..047a784
--- /dev/null
+++ b/_generator/default/project/definitions/golang/.well-known/README.md
@@ -0,0 +1,4 @@
+# .well-known folder
+
+This folder contains configuration files in a *well-known* location
+
diff --git a/_generator/default/project/definitions/golang/.well-known/devops.json b/_generator/default/project/definitions/golang/.well-known/devops.json
new file mode 100644
index 0000000..247552c
--- /dev/null
+++ b/_generator/default/project/definitions/golang/.well-known/devops.json
@@ -0,0 +1,180 @@
+{
+    "apis": [
+        {
+            "api": {
+                "category": "API",
+                "id": "",
+                "name": "OpenAPI",
+                "url": ""
+            },
+            "format": "OpenAPI",
+            "guide": "",
+            "name": "CHANGE.ME",
+            "release_id": "",
+            "service_id": "OpenAPI CHANGE.ME",
+            "url": "^/specs/openapi.json"
+        },
+        {
+            "api": {
+                "category": "API",
+                "id": "",
+                "name": "AsyncAPI",
+                "url": ""
+            },
+            "format": "AsyncAPI",
+            "guide": "",
+            "name": "CHANGE.ME",
+            "release_id": "",
+            "service_id": "AsyncAPI CHANGE.ME",
+            "url": "^/specs/asyncapi.json"
+        }
+    ],
+    "asset": {
+        "id": "__asset_id__",
+        "name": "",
+        "url": ""
+    },
+    "build": [
+        {
+            "activity": {
+                "category": "BUILD",
+                "id": "",
+                "name": "Lint",
+                "url": ""
+            },
+            "config": "",
+            "guide": "",
+            "id": "",
+            "platform": "windows",
+            "script": ""
+        },
+        {
+            "activity": {
+                "category": "BUILD",
+                "id": "",
+                "name": "pwsh-script",
+                "url": ""
+            },
+            "config": "",
+            "guide": "",
+            "id": "",
+            "platform": "windows",
+            "script": ""
+        }
+    ],
+    "created_on": "2025-08-07T13:13:03.2467916Z",
+    "dependency": {
+        "apis": [
+            {
+                "api": {
+                    "category": "API",
+                    "id": "",
+                    "name": "OpenAPI",
+                    "url": ""
+                },
+                "format": "OpenAPI",
+                "guide": "",
+                "name": "replace me",
+                "release_id": "",
+                "service_id": "replace me",
+                "url": ""
+            }
+        ],
+        "guide": "",
+        "tools": [
+            {
+                "activity": {
+                    "category": "COMMAND",
+                    "id": "qaskx-cli",
+                    "name": "qaskx-cli",
+                    "url": "https://qaskx.one/"
+                },
+                "guide": "https://docs.qaskx.one/qaskx-cli/",
+                "id": "d81d3293-1795-4f89-8760-acc9a33365a8",
+                "name": "qaskx-cli",
+                "platform": "",
+                "post": [],
+                "pre": []
+            },
+            {
+                "activity": {
+                    "category": "TOOL",
+                    "id": "no-command",
+                    "name": "No command"
+                },
+                "config": ".",
+                "id": "IDE",
+                "name": "Microsoft Visual Code",
+                "platform": "windows",
+                "script": "code"
+            }
+        ]
+    },
+    "deploy": [
+        {
+            "activity": {
+                "category": "DEPLOY",
+                "id": "",
+                "name": "rpm",
+                "url": ""
+            },
+            "guide": "",
+            "id": "",
+            "post": [],
+            "pre": []
+        }
+    ],
+    "governance": {
+        "availability_rating": 5,
+        "cyber_rating": 5,
+        "data_classification": "PII-1",
+        "resiliency_rating": 5
+    },
+    "name": "__app_name___",
+    "organisation": "Qaskx One",
+    "owner": {
+        "contacts": [
+            {
+                "address": "qaskx.example.qaskx.one",
+                "name": "SLACK"
+            },
+            {
+                "address": "@qaskx:example.qaskx.one",
+                "name": "MATRIX"
+            }
+        ],
+        "email": "do_not_reply@example.qaskx.one",
+        "name": "replace owner contact ",
+        "web": "https://example.qaskx.one"
+    },
+    "repository": {
+        "source": {
+            "category": "SOURCE",
+            "id": "gitea",
+            "name": "gitea",
+            "url": ""
+        }
+    },
+    "schema": {
+        "link": "",
+        "name": "",
+        "version": "0.0.1"
+    },
+    "test": [
+        {
+            "activity": {
+                "category": "TEST",
+                "id": "",
+                "name": "",
+                "url": ""
+            },
+            "config": "",
+            "guide": "",
+            "id": "",
+            "platform": "windows",
+            "script": ""
+        }
+    ],
+    "unique_id": "__unique_id___",
+    "updated_on": "2025-08-07T13:13:03.2467916Z"
+}
\ No newline at end of file
diff --git a/_generator/default/project/definitions/golang/.well-known/qaskx-config.yaml b/_generator/default/project/definitions/golang/.well-known/qaskx-config.yaml
new file mode 100644
index 0000000..5126b3d
--- /dev/null
+++ b/_generator/default/project/definitions/golang/.well-known/qaskx-config.yaml
@@ -0,0 +1,427 @@
+app:
+  name: "__app_name___"
+  version: "0.0.1"
+rediops:
+  depend: ""
+generator_handlers:
+  generators: {}
+run:
+  container:
+    engine: docker
+templates:
+  cache_off: false
+  fall_back: null
+  root_folder: ""
+  groups: {}
+logger:
+  provider: ""
+  log_level_base: ""
+  log_level: 2
+  log_writer: ""
+  log_path: ""
+  log_cmd_count: 0
+vault_file: ""
+file_format:
+  left_quote: ""
+  right_quote: ""
+  separator: ""
+  escape_match: ""
+  escape_value: ""
+lock_modify: false
+validation:
+  default_level: INFO
+scan:
+  options:
+    skip_file: ""
+    regex_file: ""
+  skip_files: []
+  regex: []
+activities:
+  engines:
+  - osEnvironment: windows
+    category: BUILD
+    id: '*default'
+    name: Default Windows engine
+    command: pwsh.exe
+    option: -Command
+  - osEnvironment: windows
+    category: BUILD
+    id: pwsh-command
+    name: ""
+    command: pwsh.exe
+    option: -Command
+  - osEnvironment: windows
+    category: BUILD
+    id: pwsh-script
+    name: ""
+    command: pwsh.exe
+    option: -File
+  - osEnvironment: windows
+    category: BUILD
+    id: cmd-command
+    name: ""
+    command: cmd.exe
+    option: ""
+  - osEnvironment: windows
+    category: BUILD
+    id: no-command
+    name: ""
+    command: '*null'
+    option: ""
+  - osEnvironment: linux
+    category: BUILD
+    id: '*default'
+    name: Default Linux engine
+    command: /bin/sh
+    option: -c
+  - osEnvironment: linux
+    category: BUILD
+    id: pwsh-command
+    name: ""
+    command: pwsh
+    option: -Command
+  - osEnvironment: linux
+    category: BUILD
+    id: pwsh-script
+    name: ""
+    command: pwsh
+    option: -File
+  - osEnvironment: darwin
+    category: BUILD
+    id: '*default'
+    name: ""
+    command: /bin/sh
+    option: -c
+  - osEnvironment: windows
+    category: TEST
+    id: '*default'
+    name: Default Windows engine
+    command: pwsh.exe
+    option: -Command
+  - osEnvironment: windows
+    category: TEST
+    id: pwsh-command
+    name: ""
+    command: pwsh.exe
+    option: -Command
+  - osEnvironment: windows
+    category: TEST
+    id: pwsh-script
+    name: ""
+    command: pwsh.exe
+    option: -File
+  - osEnvironment: windows
+    category: TEST
+    id: cmd-command
+    name: ""
+    command: cmd.exe
+    option: ""
+  - osEnvironment: windows
+    category: TEST
+    id: no-command
+    name: ""
+    command: '*null'
+    option: ""
+  - osEnvironment: linux
+    category: TEST
+    id: '*default'
+    name: Default Linux engine
+    command: /bin/sh
+    option: -c
+  - osEnvironment: linux
+    category: TEST
+    id: pwsh-command
+    name: ""
+    command: pwsh
+    option: -Command
+  - osEnvironment: linux
+    category: TEST
+    id: pwsh-script
+    name: ""
+    command: pwsh
+    option: -File
+  - osEnvironment: darwin
+    category: TEST
+    id: '*default'
+    name: ""
+    command: /bin/sh
+    option: -c
+  - osEnvironment: windows
+    category: DEPLOY
+    id: '*default'
+    name: Default Windows engine
+    command: pwsh.exe
+    option: -Command
+  - osEnvironment: windows
+    category: DEPLOY
+    id: pwsh-command
+    name: ""
+    command: pwsh.exe
+    option: -Command
+  - osEnvironment: windows
+    category: DEPLOY
+    id: pwsh-script
+    name: ""
+    command: pwsh.exe
+    option: -File
+  - osEnvironment: windows
+    category: DEPLOY
+    id: cmd-command
+    name: ""
+    command: cmd.exe
+    option: ""
+  - osEnvironment: windows
+    category: DEPLOY
+    id: no-command
+    name: ""
+    command: '*null'
+    option: ""
+  - osEnvironment: linux
+    category: DEPLOY
+    id: '*default'
+    name: Default Linux engine
+    command: /bin/sh
+    option: -c
+  - osEnvironment: linux
+    category: DEPLOY
+    id: pwsh-command
+    name: ""
+    command: pwsh
+    option: -Command
+  - osEnvironment: linux
+    category: DEPLOY
+    id: pwsh-script
+    name: ""
+    command: pwsh
+    option: -File
+  - osEnvironment: darwin
+    category: DEPLOY
+    id: '*default'
+    name: ""
+    command: /bin/sh
+    option: -c
+  - osEnvironment: windows
+    category: SOURCE
+    id: '*default'
+    name: Default Windows engine
+    command: pwsh.exe
+    option: -Command
+  - osEnvironment: windows
+    category: SOURCE
+    id: pwsh-command
+    name: ""
+    command: pwsh.exe
+    option: -Command
+  - osEnvironment: windows
+    category: SOURCE
+    id: pwsh-script
+    name: ""
+    command: pwsh.exe
+    option: -File
+  - osEnvironment: windows
+    category: SOURCE
+    id: cmd-command
+    name: ""
+    command: cmd.exe
+    option: ""
+  - osEnvironment: windows
+    category: SOURCE
+    id: no-command
+    name: ""
+    command: '*null'
+    option: ""
+  - osEnvironment: linux
+    category: SOURCE
+    id: '*default'
+    name: Default Linux engine
+    command: /bin/sh
+    option: -c
+  - osEnvironment: linux
+    category: SOURCE
+    id: pwsh-command
+    name: ""
+    command: pwsh
+    option: -Command
+  - osEnvironment: linux
+    category: SOURCE
+    id: pwsh-script
+    name: ""
+    command: pwsh
+    option: -File
+  - osEnvironment: darwin
+    category: SOURCE
+    id: '*default'
+    name: ""
+    command: /bin/sh
+    option: -c
+  - osEnvironment: windows
+    category: RELEASE
+    id: '*default'
+    name: Default Windows engine
+    command: pwsh.exe
+    option: -Command
+  - osEnvironment: windows
+    category: RELEASE
+    id: pwsh-command
+    name: ""
+    command: pwsh.exe
+    option: -Command
+  - osEnvironment: windows
+    category: RELEASE
+    id: pwsh-script
+    name: ""
+    command: pwsh.exe
+    option: -File
+  - osEnvironment: windows
+    category: RELEASE
+    id: cmd-command
+    name: ""
+    command: cmd.exe
+    option: ""
+  - osEnvironment: windows
+    category: RELEASE
+    id: no-command
+    name: ""
+    command: '*null'
+    option: ""
+  - osEnvironment: linux
+    category: RELEASE
+    id: '*default'
+    name: Default Linux engine
+    command: /bin/sh
+    option: -c
+  - osEnvironment: linux
+    category: RELEASE
+    id: pwsh-command
+    name: ""
+    command: pwsh
+    option: -Command
+  - osEnvironment: linux
+    category: RELEASE
+    id: pwsh-script
+    name: ""
+    command: pwsh
+    option: -File
+  - osEnvironment: darwin
+    category: RELEASE
+    id: '*default'
+    name: ""
+    command: /bin/sh
+    option: -c
+  - osEnvironment: windows
+    category: TOOL
+    id: '*default'
+    name: Default Windows engine
+    command: pwsh.exe
+    option: -Command
+  - osEnvironment: windows
+    category: TOOL
+    id: pwsh-command
+    name: ""
+    command: pwsh.exe
+    option: -Command
+  - osEnvironment: windows
+    category: TOOL
+    id: pwsh-script
+    name: ""
+    command: pwsh.exe
+    option: -File
+  - osEnvironment: windows
+    category: TOOL
+    id: cmd-command
+    name: ""
+    command: cmd.exe
+    option: ""
+  - osEnvironment: windows
+    category: TOOL
+    id: no-command
+    name: ""
+    command: '*null'
+    option: ""
+  - osEnvironment: linux
+    category: TOOL
+    id: '*default'
+    name: Default Linux engine
+    command: /bin/sh
+    option: -c
+  - osEnvironment: linux
+    category: TOOL
+    id: pwsh-command
+    name: ""
+    command: pwsh
+    option: -Command
+  - osEnvironment: linux
+    category: TOOL
+    id: pwsh-script
+    name: ""
+    command: pwsh
+    option: -File
+  - osEnvironment: darwin
+    category: TOOL
+    id: '*default'
+    name: ""
+    command: /bin/sh
+    option: -c
+  - osEnvironment: windows
+    category: REFRESH
+    id: '*default'
+    name: Default Windows engine
+    command: pwsh.exe
+    option: -Command
+  - osEnvironment: windows
+    category: REFRESH
+    id: pwsh-command
+    name: ""
+    command: pwsh.exe
+    option: -Command
+  - osEnvironment: windows
+    category: REFRESH
+    id: pwsh-script
+    name: ""
+    command: pwsh.exe
+    option: -File
+  - osEnvironment: windows
+    category: REFRESH
+    id: cmd-command
+    name: ""
+    command: cmd.exe
+    option: ""
+  - osEnvironment: windows
+    category: REFRESH
+    id: no-command
+    name: ""
+    command: '*null'
+    option: ""
+  - osEnvironment: linux
+    category: REFRESH
+    id: '*default'
+    name: Default Linux engine
+    command: /bin/sh
+    option: -c
+  - osEnvironment: linux
+    category: REFRESH
+    id: pwsh-command
+    name: ""
+    command: pwsh
+    option: -Command
+  - osEnvironment: linux
+    category: REFRESH
+    id: pwsh-script
+    name: ""
+    command: pwsh
+    option: -File
+  - osEnvironment: darwin
+    category: REFRESH
+    id: '*default'
+    name: ""
+    command: /bin/sh
+    option: -c
+git_info:
+  GitProvider: __provider___
+  GitHost: https://change.me.example.com
+  GitApi: https://change.me.example.com/api/v1
+  GitOrg: __git_org__
+  GitRepoUser: __git_user__
+  GitBranch: main
+  GitUserEmail: ""
+  git_embedded: false
diff --git a/_generator/default/project/definitions/golang/deploy-remote.ps1 b/_generator/default/project/definitions/golang/build/deploy-remote.ps1
similarity index 100%
rename from _generator/default/project/definitions/golang/deploy-remote.ps1
rename to _generator/default/project/definitions/golang/build/deploy-remote.ps1
diff --git a/_generator/default/project/definitions/golang/src/README.md b/_generator/default/project/definitions/golang/src/README.md
new file mode 100644
index 0000000..ce1f5cf
--- /dev/null
+++ b/_generator/default/project/definitions/golang/src/README.md
@@ -0,0 +1,3 @@
+# Source folder
+
+This folder will hold the source code for the project
diff --git a/_generator/default/project/golang.json b/_generator/default/project/golang.json
index 42e02e6..decc4d4 100644
--- a/_generator/default/project/golang.json
+++ b/_generator/default/project/golang.json
@@ -4,11 +4,25 @@
     "description": "golang project template",
     "templates": [
         {
-            "engine": "",  
-            "folder": "{{.TemplateDefinition.SelfFolder}}/definitions/{{.TemplateDefinition.Name}}",
+            "engine": "",
+            "folder": "{{.TemplateDefinition.SelfFolder}}/definitions/{{.TemplateDefinition.Name}}/src",
             "file_name": "*",
-            "output_folder": "^/srcg",
+            "output_folder": "^/src",
             "output_name": "*"
-       }
+        },
+        {
+            "engine": "",
+            "folder": "{{.TemplateDefinition.SelfFolder}}/definitions/{{.TemplateDefinition.Name}}/build",
+            "file_name": "*",
+            "output_folder": "^/build",
+            "output_name": "*"
+        },
+        {
+            "engine": "",
+            "folder": "{{.TemplateDefinition.SelfFolder}}/definitions/{{.TemplateDefinition.Name}}/.well-known",
+            "file_name": "*",
+            "output_folder": "^/.well-known",
+            "output_name": "*"
+        }
     ]
 }
\ No newline at end of file
diff --git a/generator/default/deploy/definitions/rediops/devops.json b/generator/default/deploy/definitions/rediops/devops.json
index 288a794..17a7a53 100644
--- a/generator/default/deploy/definitions/rediops/devops.json
+++ b/generator/default/deploy/definitions/rediops/devops.json
@@ -8,7 +8,7 @@
             },
             "format": "OpenAPI",
             "guide": "",
-            "name": "replace me from template {{.DotQaskxConfig.GitBranch}}",
+            "name": "replace me from template {{.DotQaskxConfig.VcsBranch}}",
             "release_id": "latest",
             "service_id": "OpenAPI replace me",
             "url": "^/specs/openapi.json"
diff --git a/rediops/default/definitions/custom/devops.json b/rediops/default/definitions/custom/devops.json
index 5174427..3fcb982 100644
--- a/rediops/default/definitions/custom/devops.json
+++ b/rediops/default/definitions/custom/devops.json
@@ -8,7 +8,7 @@
             },
             "format": "OpenAPI",
             "guide": "",
-            "name": "template {{.DotQaskxConfig.GitBranch}}",
+            "name": "template {{.DotQaskxConfig.VcsBranch}}",
             "release_id": "latest",
             "service_id": "OpenAPI replace me",
             "url": "^/specs/openapi.json"
diff --git a/rediops/default/definitions/default/.well-known/devops.json b/rediops/default/definitions/default/.well-known/devops.json
index dc05cd7..5f80f7d 100644
--- a/rediops/default/definitions/default/.well-known/devops.json
+++ b/rediops/default/definitions/default/.well-known/devops.json
@@ -8,7 +8,7 @@
             },
             "format": "OpenAPI",
             "guide": "",
-            "name": "replace me from template {{.DotQaskxConfig.GitBranch}}",
+            "name": "replace me from template {{.DotQaskxConfig.VcsBranch}}",
             "release_id": "latest",
             "service_id": "OpenAPI replace me",
             "url": "^/specs/openapi.json"