diff --git a/.github/labels-issues.yml b/.github/labels-issues.yml
index 354cadc3f..ea84f9e53 100644
--- a/.github/labels-issues.yml
+++ b/.github/labels-issues.yml
@@ -58,3 +58,9 @@ lookup:folder:
 
 lookup:folders:
   - 'Component Name: lookup_folders'
+
+lookup:host:
+  - 'Component Name: lookup_host'
+
+lookup:hosts:
+  - 'Component Name: lookup_hosts'
diff --git a/.github/labels-prs.yml b/.github/labels-prs.yml
index 67984e9b5..8b7f74d12 100644
--- a/.github/labels-prs.yml
+++ b/.github/labels-prs.yml
@@ -51,7 +51,13 @@ lookup:version:
   - 'plugins/modules/lookup/version.py'
 
 lookup:folder:
-  - 'Component Name: lookup_folder'
+  - 'plugins/modules/lookup/folder.py'
 
 lookup:folders:
-  - 'Component Name: lookup_folders'
+  - 'plugins/modules/lookup/folders.py'
+
+lookup:host:
+  - 'plugins/modules/lookup/host.py'
+
+lookup:hosts:
+  - 'plugins/modules/lookup/hosts.py'
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index a71362da4..29e5b48b1 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -1,4 +1,9 @@
 ---
+
+env:
+  NAMESPACE: checkmk
+  COLLECTION_NAME: general
+
 name: Release Collection
 
 on: # yamllint disable-line rule:truthy
@@ -85,13 +90,13 @@ jobs:
         run: ansible-galaxy collection build build/src --force
 
       - name: Install Ansible Collection
-        run: ansible-galaxy collection install --no-deps ./checkmk-general-${{ steps.current_version.outputs.version }}.tar.gz
+        run: ansible-galaxy collection install --no-deps ./${{env.NAMESPACE}}-${{env.COLLECTION_NAME}}-${{ steps.current_version.outputs.version }}.tar.gz
 
       - name: Compile Collection Changelog
         run: antsibull-changelog release
 
       - name: Compile Collection Docs
-        run: antsibull-docs collection --use-current --squash-hierarchy --fail-on-error --dest-dir ./docs/ checkmk.general
+        run: antsibull-docs collection --use-current --squash-hierarchy --fail-on-error --dest-dir ./docs/ ${{env.NAMESPACE}}.${{env.COLLECTION_NAME}}
 
       - name: Create Pull Request for docs and changelog against devel branch
         uses: peter-evans/create-pull-request@v5
@@ -136,13 +141,13 @@ jobs:
           prerelease: false
           name: v${{ steps.current_version.outputs.version }}
           tag_name: v${{ steps.current_version.outputs.version }}
-          files: checkmk-general-${{ steps.current_version.outputs.version }}.tar.gz
+          files: ${{env.NAMESPACE}}-${{env.COLLECTION_NAME}}-${{ steps.current_version.outputs.version }}.tar.gz
           body: |
-            # Ansible Collection: checkmk.general
+            # Ansible Collection: ${{env.NAMESPACE}}.${{env.COLLECTION_NAME}}
 
             For information about this collection and how to install it, refer to the [README](https://github.com/Checkmk/ansible-collection-checkmk.general/blob/main/README.md).
             
             For a detailed changelog, refer to the [CHANGELOG](https://github.com/Checkmk/ansible-collection-checkmk.general/blob/main/CHANGELOG.rst).
 
       - name: Publish Ansible Collection to the Galaxy
-        run: ansible-galaxy collection publish checkmk-general-${{ steps.current_version.outputs.version }}.tar.gz --api-key ${{ secrets.GALAXY_API_KEY }}
+        run: ansible-galaxy collection publish ${{env.NAMESPACE}}-${{env.COLLECTION_NAME}}-${{ steps.current_version.outputs.version }}.tar.gz --api-key ${{ secrets.GALAXY_API_KEY }}