diff --git a/.drone.env b/.ci.env
similarity index 54%
rename from .drone.env
rename to .ci.env
index cb9f953..3e0aeac 100644
--- a/.drone.env
+++ b/.ci.env
@@ -1,4 +1,3 @@
-# export ANSIBLE_LINT_EXCLUSION="--exclude collections/ansible_collections/ansible* --exclude collections/ansible_collections/community* --exclude .gitea"
 export ANSIBLE_LINT_EXCLUSION="--exclude collections/ansible_collections --exclude .gitea"
 export ANSIBLE_INVENTORY="-i 127.0.0.1, --connection=local"
 export ANSIBLE_PLAYBOOK="baseos.yml"
diff --git a/.drone.yml b/.drone.yml
deleted file mode 100644
index ad4e45d..0000000
--- a/.drone.yml
+++ /dev/null
@@ -1,154 +0,0 @@
----
-kind: pipeline
-type: docker
-name: CentOS_9-Ansible-Pipeline
-
-trigger:
-  branch:
-    exclude:
-      - main
-  event: [push]
-
-steps:
-  - name: ansible_environment_verify
-    image: gitea.thezengarden.net/podman/ansible-dev/centos9:release
-    commands:
-      - . ./.drone.env
-      - env
-      - git log -1
-      - ansible --version
-      - ansible-lint --version
-
-  - name: ansible_galaxy_requirements
-    image: gitea.thezengarden.net/podman/ansible-dev/centos9:release
-    commands:
-      - ansible-galaxy install -r requirements.yml
-
-  - name: ansible_lint
-    image: gitea.thezengarden.net/podman/ansible-dev/centos9:release
-    commands:
-      - . ./.drone.env
-      - ansible-lint --offline $ANSIBLE_LINT_EXCLUSION
-
-  - name: ansible_playbook_execution
-    image: gitea.thezengarden.net/podman/ansible-dev/centos9:release
-    commands:
-      - . ./.drone.env
-      - ansible-playbook -v $ANSIBLE_INVENTORY $ANSIBLE_PLAYBOOK
-
-
----
-kind: pipeline
-type: docker
-name: Fedora_39-Ansible-Pipeline
-
-trigger:
-  branch:
-    exclude:
-      - main
-  event: [push]
-
-steps:
-  - name: ansible_environment_verify
-    image: gitea.thezengarden.net/podman/ansible-dev/fedora39:release
-    commands:
-      - . ./.drone.env
-      - env
-      - git log -1
-      - ansible --version
-      - ansible-lint --version
-
-  - name: ansible_galaxy_requirements
-    image: gitea.thezengarden.net/podman/ansible-dev/fedora39:release
-    commands:
-      - ansible-galaxy install -r requirements.yml
-
-  - name: ansible_lint
-    image: gitea.thezengarden.net/podman/ansible-dev/fedora39:release
-    commands:
-      - . ./.drone.env
-      - ansible-lint --offline $ANSIBLE_LINT_EXCLUSION
-
-  - name: ansible_playbook_execution
-    image: gitea.thezengarden.net/podman/ansible-dev/fedora39:release
-    commands:
-      - . ./.drone.env
-      - ansible-playbook -v $ANSIBLE_INVENTORY $ANSIBLE_PLAYBOOK
-
-
----
-kind: pipeline
-type: docker
-name: Debian_11-Ansible-Pipeline
-
-trigger:
-  branch:
-    exclude:
-      - main
-  event: [push]
-
-steps:
-  - name: ansible_environment_verify
-    image: gitea.thezengarden.net/podman/ansible-dev/debian11:release
-    commands:
-      - . ./.drone.env
-      - env
-      - git log -1
-      - ansible --version
-      - ansible-lint --version
-
-  - name: ansible_galaxy_requirements
-    image: gitea.thezengarden.net/podman/ansible-dev/debian11:release
-    commands:
-      - ansible-galaxy install -r requirements.yml
-
-  - name: ansible_lint
-    image: gitea.thezengarden.net/podman/ansible-dev/debian11:release
-    commands:
-      - . ./.drone.env
-      - ansible-lint --offline $ANSIBLE_LINT_EXCLUSION
-
-  - name: ansible_playbook_execution
-    image: gitea.thezengarden.net/podman/ansible-dev/debian11:release
-    commands:
-      - . ./.drone.env
-      - ansible-playbook -v $ANSIBLE_INVENTORY $ANSIBLE_PLAYBOOK
-
-
----
-kind: pipeline
-type: docker
-name: Debian_12-Ansible-Pipeline
-
-trigger:
-  branch:
-    exclude:
-      - main
-  event: [push]
-
-steps:
-  - name: ansible_environment_verify
-    image: gitea.thezengarden.net/podman/ansible-dev/debian12:release
-    commands:
-      - . ./.drone.env
-      - env
-      - git log -1
-      - ansible --version
-      - ansible-lint --version
-
-  - name: ansible_galaxy_requirements
-    image: gitea.thezengarden.net/podman/ansible-dev/debian12:release
-    commands:
-      - ansible-galaxy install -r requirements.yml
-
-  - name: ansible_lint
-    image: gitea.thezengarden.net/podman/ansible-dev/debian12:release
-    commands:
-      - . ./.drone.env
-      - ansible-lint --offline $ANSIBLE_LINT_EXCLUSION
-
-  - name: ansible_playbook_execution
-    image: gitea.thezengarden.net/podman/ansible-dev/debian12:release
-    commands:
-      - . ./.drone.env
-      - ansible-playbook -v $ANSIBLE_INVENTORY $ANSIBLE_PLAYBOOK
diff --git a/.gitea/workflows/ansible-test.yml b/.gitea/workflows/ansible-test.yml
index a525dac..f26001e 100644
--- a/.gitea/workflows/ansible-test.yml
+++ b/.gitea/workflows/ansible-test.yml
@@ -7,17 +7,15 @@ on:
 
 jobs:
   Ansible-Development-Pipeline:
-    strategy:
-      matrix:
-        os: [ ansible-dev-centos9, ansible-dev-fedora39, ansible-dev-debian11, ansible-dev-debian12 ]
-    runs-on: ${{ matrix.os }}
+    runs-on: ansible-dev-centos
     steps:
       - name: Clone repository
         uses: actions/checkout@v3
 
       - name: Ansible Environment Verify
         run: |
-          . ./.drone.env
+          whoami
+          . ./.ci.env
           env
           git log -1
           ansible --version
@@ -29,10 +27,10 @@ jobs:
 
       - name: Run Ansible-Lint
         run: |
-          . ./.drone.env
+          . ./.ci.env
           ansible-lint --offline $ANSIBLE_LINT_EXCLUSION
 
       - name: Run Ansible-Playbook
         run: |
-          . ./.drone.env
+          . ./.ci.env
           ansible-playbook -v $ANSIBLE_INVENTORY $ANSIBLE_PLAYBOOK
diff --git a/ansible.cfg b/ansible.cfg
index d58a63d..8f69f42 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -14,6 +14,7 @@ timeout                 = 30
 host_key_checking       = false
 display_skipped_hosts   = false
 deprecation_warnings    = false
+force_color             = true
 
 # callback_whitelist is deprecated
 # we only include here for backwards compatibility
diff --git a/requirements.yml b/requirements.yml
index 5c6dc7f..ba21362 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -4,7 +4,7 @@ collections:
   - name: jchristianh.baseos
     source: https://gitea.thezengarden.net/ansible_collections/ansible-collection-baseos.git
     type: git
-    version: 1.0.34
+    version: 1.0.36
 
   # Galaxy Collections
   - name: community.general
diff --git a/testing/env-test.sh b/testing/env-test.sh
index e5edb50..7ddcbb5 100755
--- a/testing/env-test.sh
+++ b/testing/env-test.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-echo "Which environment to test? (centos9, fedora39, debian11, debian12)"
+echo "Which environment to test? (centos, fedora, debian)"
 read test_environment
 
 CNAME="testing-${test_environment}"