diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 52d166e..134b9ed 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,10 @@ stages:
 include:
   - project: 'developerdurp/jobtemplates'
     ref: main
-    file: 'terraform.yml'
+    file: 
+      - 'terraform.yml'
+      - 'ansible.yml'
+    
     
 plan:
   stage: lint
@@ -32,39 +35,19 @@ apply:
     - changes:
         - 'terraform/*'
 
+k3s:
+  stage: build
+  variables:
+    FILE: $CI_PROJECT_DIR/jobs/main.yml
+    REQUIREMENTS: $CI_PROJECT_DIR/group_vars/requirements.yml
+  allow_failure: false
+  extends: .ansible_apply 
+  #rules:
+  #  - if: '$CI_COMMIT_BRANCH == "main"'
+  #  - changes:
+  #      - 'terraform/*'
+
 
-#apply:
-#  stage: apply
-#  image:
-#    name: hashicorp/terraform:light
-#    entrypoint:
-#      - '/usr/bin/env'
-#      - 'PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
-#  variables:
-#    PLAN: plan.tfplan
-#    JSON_PLAN_FILE: tfplan.json
-#    TF_IN_AUTOMATION: "true"
-#    GITLAB_TF_ADDRESS: ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/terraform/state/${CI_PROJECT_NAME}
-#  cache:
-#    key: "$CI_COMMIT_SHA"
-#    paths:
-#      - .terraform
-#  script:    
-#    - apk add --update curl jq
-#    - alias convert_report="jq -r '([.resource_changes[].change.actions?]|flatten)|{\"create\":(map(select(.==\"create\"))|length),\"update\":(map(select(.==\"update\"))|length),\"delete\":(map(select(.==\"delete\"))|length)}'"
-#    - terraform --version
-#    - terraform init -reconfigure -backend-config="address=${GITLAB_TF_ADDRESS}" -backend-config="lock_address=${GITLAB_TF_ADDRESS}/lock" -backend-config="unlock_address=${GITLAB_TF_ADDRESS}/lock" -backend-config="username=gitlab-ci-token" -backend-config="password=${CI_JOB_TOKEN}" -backend-config="lock_method=POST" -backend-config="unlock_method=DELETE" -backend-config="retry_wait_min=5"      
-#    - terraform apply -auto-approve -var-file=terraform.tfvars
-#  after_script:
-#    - curl --request PUT --header "PRIVATE-TOKEN:${jobtoken}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/variables/kubeconfig" --form "value=$(cat config)" > null
-#  dependencies:
-#    - plan 
-#  only:
-#    changes:
-#      - terraform.tf 
-#      - terraform.tfvars    
-#      - jobs/main.yml      
-#  when: manual      
 #
 #ansible-apply:
 #  stage: apply
diff --git a/ansible.cfg b/ansible/ansible.cfg
similarity index 85%
rename from ansible.cfg
rename to ansible/ansible.cfg
index c875f75..b38b1f0 100644
--- a/ansible.cfg
+++ b/ansible/ansible.cfg
@@ -1,6 +1,6 @@
 [defaults]
-inventory = ./group_vars/hosts.ini
-roles_path = ./roles
+inventory = ./hosts.ini
+roles_path = ../roles
 become = True
 host_key_checking = False
 host_key_check = False
diff --git a/group_vars/ansible.pub b/ansible/ansible.pub
similarity index 100%
rename from group_vars/ansible.pub
rename to ansible/ansible.pub
diff --git a/jobs/dns.yml b/ansible/dns.yml
similarity index 100%
rename from jobs/dns.yml
rename to ansible/dns.yml
diff --git a/group_vars/hosts.ini b/ansible/hosts.ini
similarity index 100%
rename from group_vars/hosts.ini
rename to ansible/hosts.ini
diff --git a/jobs/main.yml b/ansible/main.yml
similarity index 100%
rename from jobs/main.yml
rename to ansible/main.yml
diff --git a/group_vars/requirements.yml b/ansible/requirements.yml
similarity index 100%
rename from group_vars/requirements.yml
rename to ansible/requirements.yml
diff --git a/jobs/update.yml b/ansible/update.yml
similarity index 100%
rename from jobs/update.yml
rename to ansible/update.yml