diff --git a/.ansible-lint b/.ansible-lint
index 9048ad1..39c4d62 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -1,4 +1,5 @@
 ---
+
 parseable: true
 quiet: true
 skip_list:
@@ -11,13 +12,13 @@ skip_list:
     - 'name[casing]'
     - 'name[template]'
     - 'jinja[spacing]'
-    - yaml[line-length]
     - 'var-naming'  # Older playbook no new release
-    # - '204'
+    - '204'
+    - '208'
     - '305'
-    # - '303'
-    # - '403'
+    - '303'
+    - '403'
     - '306'
-    # - '602'
+    - '602'
 use_default_rules: true
 verbosity: 0
diff --git a/.github/workflows/linux_benchmark_testing.yml b/.github/workflows/linux_benchmark_testing.yml
deleted file mode 100644
index c6cb3a5..0000000
--- a/.github/workflows/linux_benchmark_testing.yml
+++ /dev/null
@@ -1,109 +0,0 @@
-# This is a basic workflow to help you get started with Actions
-
-name: linux_benchmark_pipeline
-
-# Controls when the action will run.
-# Triggers the workflow on push or pull request
-# events but only for the devel branch
-on:
-  pull_request_target:
-    types: [opened, reopened, synchronize]
-    branches:
-      - devel
-      - main
-    paths:
-      - '**.yml'
-      - '**.sh'
-      - '**.j2'
-      - '**.ps1'
-      - '**.cfg'
-
-# A workflow run is made up of one or more jobs
-# that can run sequentially or in parallel
-jobs:
-  # This will create messages for first time contributers and direct them to the Discord server
-  welcome:
-      runs-on: ubuntu-latest
-
-      steps:
-          - uses: actions/first-interaction@main
-            with:
-                repo-token: ${{ secrets.GITHUB_TOKEN }}
-                pr-message: |-
-                  Congrats on opening your first pull request and thank you for taking the time to help improve Ansible-Lockdown! 
-                  Please join in the conversation happening on the [Discord Server](https://discord.io/ansible-lockdown) as well.
-  # This workflow contains a single job called "build"
-  build:
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
-
-    env: 
-      ENABLE_DEBUG: false
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, 
-      # so your job can access it
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-
-      - name: Add_ssh_key
-        working-directory: .github/workflows
-        env:
-          SSH_AUTH_SOCK: /tmp/ssh_agent.sock
-          PRIVATE_KEY: "${{ secrets.SSH_PRV_KEY }}"
-        run: |
-          mkdir .ssh
-          chmod 700 .ssh
-          echo $PRIVATE_KEY > .ssh/github_actions.pem
-          chmod 600 .ssh/github_actions.pem
-
-### Build out the server
-      - name: Terraform_Init
-        working-directory: .github/workflows
-        run: terraform init
-
-      - name: Terraform_Validate
-        working-directory: .github/workflows
-        run: terraform validate
-
-      - name: Terraform_Apply
-        working-directory: .github/workflows
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        run: terraform apply -var-file "github_vars.tfvars" -var-file "OS.tfvars" --auto-approve -input=false
-
-## Debug Section
-      - name: DEBUG - Show Ansible hostfile
-        if: env.ENABLE_DEBUG == 'true'
-        working-directory: .github/workflows
-        run: cat hosts.yml
-
-# Aws deployments taking a while to come up insert sleep or playbook fails
-      - name: Sleep for 60 seconds
-        run: sleep 60s
-        shell: bash
-        
-# Run the ansible playbook
-      - name: Run_Ansible_Playbook
-        uses: arillso/action.playbook@master
-        with:
-          playbook: site.yml
-          inventory: .github/workflows/hosts.yml
-          galaxy_file: collections/requirements.yml
-          private_key: ${{ secrets.SSH_PRV_KEY }}
-#          verbose: 3
-        env:
-          ANSIBLE_HOST_KEY_CHECKING: "false"
-          ANSIBLE_DEPRECATION_WARNINGS: "false"
-
-# Remove test system - User secrets to keep if necessary
-      - name: Terraform_Destroy
-        working-directory: .github/workflows
-        if: always() && env.ENABLE_DEBUG == 'false'
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        run: terraform destroy -var-file "github_vars.tfvars" -var-file "OS.tfvars" --auto-approve -input=false
diff --git a/.github/workflows/update_galaxy.yml b/.github/workflows/update_galaxy.yml
index d2038cb..f423423 100644
--- a/.github/workflows/update_galaxy.yml
+++ b/.github/workflows/update_galaxy.yml
@@ -1,21 +1,21 @@
+# This is a basic workflow to help you get started with Actions
 
-# This is the workflow to update the Ansible Galaxy space for this role on a merge to the main branch (a new release)
-
-name: update_galaxy
+name: update galaxy
 
 # Controls when the action will run.
 # Triggers the workflow on push or pull request
-# events but only for the main branch
-on:
-  push:
-    branches:
-      - main
+# events but only for the devel branch
+on:  # yamllint disable-line rule:truthy
+    push:
+        branches:
+            - main
 
 jobs:
-  update_role:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: hspaans/ansible-galaxy-action@master
-        with:
-          api_key: ${{ secrets.GALAXY_API_KEY }}
+    update_role:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v3
+            - uses: robertdebock/galaxy-action@master
+              with:
+                  api_key: ${{ secrets.GALAXY_API_KEY }}
+                  git_branch: main
diff --git a/.github/workflows/windows_benchmark_testing.yml b/.github/workflows/windows_benchmark_testing.yml
new file mode 100644
index 0000000..a5103ea
--- /dev/null
+++ b/.github/workflows/windows_benchmark_testing.yml
@@ -0,0 +1,102 @@
+# This is a basic workflow to help you get started with Actions
+
+name: windows_testing_pipeline
+
+# Controls when the action will run.
+# Triggers the workflow on push or pull request
+# events but only for the devel branch
+on:  # yamllint disable-line rule:truthy
+    pull_request_target:
+        types: [opened, reopened, synchronize]
+        branches:
+            - devel
+            - main
+        paths:
+            - '**.yml'
+            - '**.sh'
+            - '**.j2'
+            - '**.ps1'
+            - '**.cfg'
+
+# A workflow run is made up of one or more jobs
+# that can run sequentially or in parallel
+jobs:
+  # This will create messages for first time contributers and direct them to the Discord server
+    welcome:
+        runs-on: ubuntu-latest
+
+        steps:
+            - uses: actions/first-interaction@main
+              with:
+                  repo-token: ${{ secrets.GITHUB_TOKEN }}
+                  pr-message: |-
+                    Congrats on opening your first pull request and thank you for taking the time to help improve Ansible-Lockdown!
+                    Please join in the conversation happening on the [Discord Server](https://discord.io/ansible-lockdown) as well.
+
+    # This workflow contains a single job called "build"
+    build:
+      # The type of runner that the job will run on
+        runs-on: ubuntu-latest
+
+        env:
+            ENABLE_DEBUG: false
+            ARM_CLIENT_ID: ${{ secrets.AZURE_AD_CLIENT_ID }}
+            ARM_CLIENT_SECRET: ${{ secrets.AZURE_AD_CLIENT_SECRET }}
+            ARM_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+            ARM_TENANT_ID: ${{ secrets.AZURE_AD_TENANT_ID }}
+            WIN_USERNAME: ${{ secrets.WIN_USERNAME }}
+            WIN_PASSWORD: ${{ secrets.WIN_PASSWORD }}
+
+        # Steps represent a sequence of tasks that will be executed as part of the job
+        steps:
+          # Checks-out your repository under $GITHUB_WORKSPACE,
+          # so your job can access it
+            - uses: actions/checkout@v3
+              with:
+                  ref: ${{ github.event.pull_request.head.sha }}
+
+      # Sensitive data stored and passed to terraform
+            - name: user details
+              working-directory: .github/workflows
+              run: echo "{\"username\":\"${WIN_USERNAME}\",\"password\":\"${WIN_PASSWORD}\"}" >> sensitive_info.json
+
+      # Build out the server
+            - name: Terraform_Init
+              working-directory: .github/workflows
+              run: terraform init
+
+            - name: Terraform_Validate
+              working-directory: .github/workflows
+              run: terraform validate
+
+            - name: Terraform_Apply
+              working-directory: .github/workflows
+              run: terraform apply -var-file "OS.tfvars" --auto-approve
+
+      # Debug Section
+            - name: DEBUG - Show Ansible hostfile
+              if: env.ENABLE_DEBUG == 'true'
+              working-directory: .github/workflows
+              run: cat hosts.yml
+
+      # Run the ansible playbook
+            - name: Run_Ansible_Playbook
+              uses: arillso/action.playbook@master
+              with:
+                  playbook: site.yml
+                  inventory: .github/workflows/hosts.yml
+                  galaxy_file: collections/requirements.yml
+      #          verbose: 3
+              env:
+                  ANSIBLE_HOST_KEY_CHECKING: "false"
+                  ANSIBLE_DEPRECATION_WARNINGS: "false"
+
+      # Remove test system
+
+            - name: Terraform_Destroy
+              working-directory: .github/workflows
+              if: always() && env.ENABLE_DEBUG == 'false'
+              env:
+                  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+                  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+              run: terraform destroy -var-file "github_vars.tfvars" -var-file "OS.tfvars" --auto-approve -input=false
diff --git a/.yamllint b/.yamllint
index c3e140d..c054b57 100644
--- a/.yamllint
+++ b/.yamllint
@@ -1,28 +1,24 @@
 ---
-ignore: |
-  tests/
-  molecule/
-  .github/
-  .gitlab-ci.yml
-  *molecule.yml
-
+# Based on ansible-lint config
 extends: default
 
 rules:
-    braces:
-        max-spaces-inside: 1
-        level: error
-    brackets:
-        max-spaces-inside: 1
-        level: error
+    braces: {max-spaces-inside: 1, level: error}
+    brackets: {max-spaces-inside: 1, level: error}
+    colons: {max-spaces-after: -1, level: error}
+    commas: {max-spaces-after: -1, level: error}
+    comments: disable
+    comments-indentation: disable
+    document-start: disable
+    empty-lines: {max: 3, level: error}
+    hyphens: {level: error}
     indentation:
         # Requiring 4 space indentation
         spaces: 4
         # Requiring consistent indentation within a file, either indented or not
         indent-sequences: consistent
-        level: error
-    line-length: disable
     key-duplicates: enable
+    line-length: disable
     new-line-at-end-of-file: enable
     new-lines:
         type: unix
diff --git a/tests/test.yml b/tests/test.yml
index ffaf6d3..9a2a70d 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -1,6 +1,7 @@
 ---
 
 - hosts: localhost
+
   remote_user: root
   roles:
-    - .
+      - .