diff --git a/.containers/apps/ansible/VERSION b/.containers/apps/ansible/VERSION
deleted file mode 100644
index 8b137891791..00000000000
--- a/.containers/apps/ansible/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/.github/workflows/containers.build.yaml b/.github/workflows/containers.build.yaml
index 3c6c30b4350..a5f257dca9b 100644
--- a/.github/workflows/containers.build.yaml
+++ b/.github/workflows/containers.build.yaml
@@ -6,13 +6,13 @@ on:
     branches:
     - master
     paths:
-    - '.containers/apps/**'
-    - '.containers/base/**'
+    - 'containers/apps/**'
+    - 'containers/base/**'
     - ".github/workflows/containers.build.yaml"
   pull_request:
     paths:
-    - '.containers/apps/**'
-    - '.containers/base/**'
+    - 'containers/apps/**'
+    - 'containers/base/**'
     - ".github/workflows/containers.build.yaml"
 
 env:
@@ -35,8 +35,8 @@ jobs:
         list-files: json
         filters: |
           changed:
-          - '.containers/apps/**'
-          - '.containers/base/**'
+          - 'containers/apps/**'
+          - 'containers/base/**'
     - run: echo '${{ toJson(steps.filter.outputs) }}' > changes.json
     - id: reduce
       run: |
@@ -75,17 +75,17 @@ jobs:
     - name: Prepare
       id: prep
       run: |
-        if test -f "./.containers/apps/${{ matrix.container }}/Dockerfile"; then
+        if test -f "./containers/apps/${{ matrix.container }}/Dockerfile"; then
           CATEGORY="apps"
         else
           CATEGORY="base"
         fi
         echo ::set-output name=category::${CATEGORY}
-        VERSION=$(cat ./.containers/${CATEGORY}/${{ matrix.container }}/VERSION)
+        VERSION=$(cat ./containers/${CATEGORY}/${{ matrix.container }}/VERSION)
         echo ::set-output name=version::${VERSION}
         PLATFORM="linux/amd64"
         echo ::set-output name=platform::${PLATFORM}
-        if test -f "./.containers/${CATEGORY}/${{ matrix.container }}/goss.yaml"; then
+        if test -f "./containers/${CATEGORY}/${{ matrix.container }}/goss.yaml"; then
           echo ::set-output name=goss::true
         else
           echo ::set-output name=goss::false
@@ -136,7 +136,7 @@ jobs:
       with:
         build-args: VERSION=${{ steps.prep.outputs.version }}
         context: .
-        file: ./.containers/${{ steps.prep.outputs.category }}/${{ matrix.container }}/Dockerfile
+        file: ./containers/${{ steps.prep.outputs.category }}/${{ matrix.container }}/Dockerfile
         load: true
         tags: |
           ghcr.io/${{ github.repository_owner }}/${{ matrix.container }}:test
@@ -147,7 +147,7 @@ jobs:
     - name: Run GOSS tests
       if: ${{ steps.prep.outputs.goss == 'true' }}
       env:
-        GOSS_FILE: ./.containers/${{ steps.prep.outputs.category }}/${{ matrix.container }}/goss.yaml
+        GOSS_FILE: ./containers/${{ steps.prep.outputs.category }}/${{ matrix.container }}/goss.yaml
       run: |
         dgoss run ghcr.io/${{ github.repository_owner }}/${{ matrix.container }}:test
 
@@ -158,7 +158,7 @@ jobs:
         build-args: VERSION=${{ steps.prep.outputs.version }}
         context: .
         platforms: ${{ steps.prep.outputs.platform }}
-        file: ./.containers/${{ steps.prep.outputs.category }}/${{ matrix.container }}/Dockerfile
+        file: ./containers/${{ steps.prep.outputs.category }}/${{ matrix.container }}/Dockerfile
         push: ${{ steps.prep.outputs.push }}
         tags: |
           ghcr.io/${{ github.repository_owner }}/${{ matrix.container }}:latest
diff --git a/.github/workflows/containers.update.yaml b/.github/workflows/containers.update.yaml
index 66b2ea093bc..a9fc856d46d 100644
--- a/.github/workflows/containers.update.yaml
+++ b/.github/workflows/containers.update.yaml
@@ -21,19 +21,19 @@ jobs:
         fetch-depth: 1
     - name: Fetch new application versions
       run: |
-        find ./.containers/apps -maxdepth 1 -mindepth 1 -type d -exec basename {} \; | while read app; do
-          if test -f "./.containers/apps/${app}/latest-version.sh"; then
-            version=$(bash "./.containers/apps/${app}/latest-version.sh")
+        find ./containers/apps -maxdepth 1 -mindepth 1 -type d -exec basename {} \; | while read app; do
+          if test -f "./containers/apps/${app}/latest-version.sh"; then
+            version=$(bash "./containers/apps/${app}/latest-version.sh")
             if [[ ! -z "${version}" || "${version}" != "null" ]]; then
-              echo "${version}" | tee "./.containers/apps/${app}/VERSION" > /dev/null
+              echo "${version}" | tee "./containers/apps/${app}/VERSION" > /dev/null
               echo "App: ${app} using version: ${version}"
             fi
           fi
-          if test -f "./.containers/apps/${app}/BASE"; then
-            if test -f "./.containers/apps/${app}/latest-base.sh"; then
-              base=$(bash "./.containers/apps/${app}/latest-base.sh")
+          if test -f "./containers/apps/${app}/BASE"; then
+            if test -f "./containers/apps/${app}/latest-base.sh"; then
+              base=$(bash "./containers/apps/${app}/latest-base.sh")
               if [[ ! -z "${base}" || "${base}" != "null" ]]; then
-                echo "${base}" | tee ".containers/apps/${app}/BASE" > /dev/null
+                echo "${base}" | tee "containers/apps/${app}/BASE" > /dev/null
                 echo "App: ${app} using Base: ${base}"
               fi
             fi
@@ -41,11 +41,11 @@ jobs:
         done
     - name: Fetch new base versions
       run: |
-        find ./.containers/base -maxdepth 1 -mindepth 1 -type d -exec basename {} \; | while read app; do
-          if test -f "./.containers/base/${app}/latest-version.sh"; then
-            version=$(bash "./.containers/base/${app}/latest-version.sh")
+        find ./containers/base -maxdepth 1 -mindepth 1 -type d -exec basename {} \; | while read app; do
+          if test -f "./containers/base/${app}/latest-version.sh"; then
+            version=$(bash "./containers/base/${app}/latest-version.sh")
             if [[ ! -z "${version}" || "${version}" != "null" ]]; then
-              echo "${version}" | tee "./.containers/base/${app}/VERSION" > /dev/null
+              echo "${version}" | tee "./containers/base/${app}/VERSION" > /dev/null
               echo "${app} ${version}"
             fi
           fi
diff --git a/.github/workflows/general.security-scan.yaml b/.github/workflows/general.security-scan.yaml
index 8c3792f4057..8436ba7898c 100644
--- a/.github/workflows/general.security-scan.yaml
+++ b/.github/workflows/general.security-scan.yaml
@@ -21,7 +21,7 @@ jobs:
         with:
           token: ${{ secrets.BOT_TOKEN }}
       - id: set-dirs # Give it an id to handle to get step outputs in the outputs key above
-        run: echo "::set-output name=dir::$({ ls -d .containers/apps/*/ & ls -d .containers/base/*/; } | tr '\n' '\0' | xargs -0 -n 1 basename | jq -R -s -c 'split("\n")[:-1]')"
+        run: echo "::set-output name=dir::$({ ls -d containers/apps/*/ & ls -d containers/base/*/; } | tr '\n' '\0' | xargs -0 -n 1 basename | jq -R -s -c 'split("\n")[:-1]')"
         # Define step output named dir base on ls command transformed to JSON thanks to jq
 
 
diff --git a/.containers/apps/ansible/Dockerfile b/containers/apps/ansible/Dockerfile
similarity index 100%
rename from .containers/apps/ansible/Dockerfile
rename to containers/apps/ansible/Dockerfile
diff --git a/.containers/base/alpine/.gitkeep b/containers/apps/ansible/VERSION
similarity index 100%
rename from .containers/base/alpine/.gitkeep
rename to containers/apps/ansible/VERSION
diff --git a/.containers/apps/ansible/entrypoint.sh b/containers/apps/ansible/entrypoint.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/apps/ansible/entrypoint.sh
rename to containers/apps/ansible/entrypoint.sh
diff --git a/.containers/apps/ansible/latest-version.sh b/containers/apps/ansible/latest-version.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/apps/ansible/latest-version.sh
rename to containers/apps/ansible/latest-version.sh
diff --git a/.containers/apps/appdaemon/Dockerfile b/containers/apps/appdaemon/Dockerfile
similarity index 100%
rename from .containers/apps/appdaemon/Dockerfile
rename to containers/apps/appdaemon/Dockerfile
diff --git a/.containers/apps/appdaemon/VERSION b/containers/apps/appdaemon/VERSION
similarity index 100%
rename from .containers/apps/appdaemon/VERSION
rename to containers/apps/appdaemon/VERSION
diff --git a/.containers/apps/appdaemon/latest-version.sh b/containers/apps/appdaemon/latest-version.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/apps/appdaemon/latest-version.sh
rename to containers/apps/appdaemon/latest-version.sh
diff --git a/.containers/apps/bazarr/Dockerfile b/containers/apps/bazarr/Dockerfile
similarity index 100%
rename from .containers/apps/bazarr/Dockerfile
rename to containers/apps/bazarr/Dockerfile
diff --git a/.containers/apps/bazarr/VERSION b/containers/apps/bazarr/VERSION
similarity index 100%
rename from .containers/apps/bazarr/VERSION
rename to containers/apps/bazarr/VERSION
diff --git a/.containers/apps/bazarr/goss.yaml b/containers/apps/bazarr/goss.yaml
similarity index 100%
rename from .containers/apps/bazarr/goss.yaml
rename to containers/apps/bazarr/goss.yaml
diff --git a/.containers/apps/bazarr/latest-version.sh b/containers/apps/bazarr/latest-version.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/apps/bazarr/latest-version.sh
rename to containers/apps/bazarr/latest-version.sh
diff --git a/.containers/apps/emby/Dockerfile b/containers/apps/emby/Dockerfile
similarity index 100%
rename from .containers/apps/emby/Dockerfile
rename to containers/apps/emby/Dockerfile
diff --git a/.containers/apps/emby/VERSION b/containers/apps/emby/VERSION
similarity index 100%
rename from .containers/apps/emby/VERSION
rename to containers/apps/emby/VERSION
diff --git a/.containers/apps/emby/entrypoint.sh b/containers/apps/emby/entrypoint.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/apps/emby/entrypoint.sh
rename to containers/apps/emby/entrypoint.sh
diff --git a/.containers/apps/emby/goss.yaml b/containers/apps/emby/goss.yaml
similarity index 100%
rename from .containers/apps/emby/goss.yaml
rename to containers/apps/emby/goss.yaml
diff --git a/.containers/apps/emby/latest-version.sh b/containers/apps/emby/latest-version.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/apps/emby/latest-version.sh
rename to containers/apps/emby/latest-version.sh
diff --git a/.containers/apps/jackett/Dockerfile b/containers/apps/jackett/Dockerfile
similarity index 100%
rename from .containers/apps/jackett/Dockerfile
rename to containers/apps/jackett/Dockerfile
diff --git a/.containers/apps/jackett/VERSION b/containers/apps/jackett/VERSION
similarity index 100%
rename from .containers/apps/jackett/VERSION
rename to containers/apps/jackett/VERSION
diff --git a/.containers/apps/jackett/entrypoint.sh b/containers/apps/jackett/entrypoint.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/apps/jackett/entrypoint.sh
rename to containers/apps/jackett/entrypoint.sh
diff --git a/.containers/apps/jackett/goss.yaml b/containers/apps/jackett/goss.yaml
similarity index 100%
rename from .containers/apps/jackett/goss.yaml
rename to containers/apps/jackett/goss.yaml
diff --git a/.containers/apps/jackett/latest-version.sh b/containers/apps/jackett/latest-version.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/apps/jackett/latest-version.sh
rename to containers/apps/jackett/latest-version.sh
diff --git a/.containers/apps/lidarr/Dockerfile b/containers/apps/lidarr/Dockerfile
similarity index 100%
rename from .containers/apps/lidarr/Dockerfile
rename to containers/apps/lidarr/Dockerfile
diff --git a/.containers/apps/lidarr/VERSION b/containers/apps/lidarr/VERSION
similarity index 100%
rename from .containers/apps/lidarr/VERSION
rename to containers/apps/lidarr/VERSION
diff --git a/.containers/apps/lidarr/entrypoint.sh b/containers/apps/lidarr/entrypoint.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/apps/lidarr/entrypoint.sh
rename to containers/apps/lidarr/entrypoint.sh
diff --git a/.containers/apps/lidarr/goss.yaml b/containers/apps/lidarr/goss.yaml
similarity index 100%
rename from .containers/apps/lidarr/goss.yaml
rename to containers/apps/lidarr/goss.yaml
diff --git a/.containers/apps/lidarr/latest-version.sh b/containers/apps/lidarr/latest-version.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/apps/lidarr/latest-version.sh
rename to containers/apps/lidarr/latest-version.sh
diff --git a/.containers/apps/nzbget/Dockerfile b/containers/apps/nzbget/Dockerfile
similarity index 100%
rename from .containers/apps/nzbget/Dockerfile
rename to containers/apps/nzbget/Dockerfile
diff --git a/.containers/apps/nzbget/VERSION b/containers/apps/nzbget/VERSION
similarity index 100%
rename from .containers/apps/nzbget/VERSION
rename to containers/apps/nzbget/VERSION
diff --git a/.containers/apps/nzbget/entrypoint.sh b/containers/apps/nzbget/entrypoint.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/apps/nzbget/entrypoint.sh
rename to containers/apps/nzbget/entrypoint.sh
diff --git a/.containers/apps/nzbget/goss.yaml b/containers/apps/nzbget/goss.yaml
similarity index 100%
rename from .containers/apps/nzbget/goss.yaml
rename to containers/apps/nzbget/goss.yaml
diff --git a/.containers/apps/nzbget/latest-version.sh b/containers/apps/nzbget/latest-version.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/apps/nzbget/latest-version.sh
rename to containers/apps/nzbget/latest-version.sh
diff --git a/.containers/apps/nzbhydra2/Dockerfile b/containers/apps/nzbhydra2/Dockerfile
similarity index 100%
rename from .containers/apps/nzbhydra2/Dockerfile
rename to containers/apps/nzbhydra2/Dockerfile
diff --git a/.containers/apps/nzbhydra2/VERSION b/containers/apps/nzbhydra2/VERSION
similarity index 100%
rename from .containers/apps/nzbhydra2/VERSION
rename to containers/apps/nzbhydra2/VERSION
diff --git a/.containers/apps/nzbhydra2/entrypoint.sh b/containers/apps/nzbhydra2/entrypoint.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/apps/nzbhydra2/entrypoint.sh
rename to containers/apps/nzbhydra2/entrypoint.sh
diff --git a/.containers/apps/nzbhydra2/goss.yaml b/containers/apps/nzbhydra2/goss.yaml
similarity index 100%
rename from .containers/apps/nzbhydra2/goss.yaml
rename to containers/apps/nzbhydra2/goss.yaml
diff --git a/.containers/apps/nzbhydra2/latest-version.sh b/containers/apps/nzbhydra2/latest-version.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/apps/nzbhydra2/latest-version.sh
rename to containers/apps/nzbhydra2/latest-version.sh
diff --git a/.containers/apps/ombi/BASE b/containers/apps/ombi/BASE
similarity index 100%
rename from .containers/apps/ombi/BASE
rename to containers/apps/ombi/BASE
diff --git a/.containers/apps/ombi/Dockerfile b/containers/apps/ombi/Dockerfile
similarity index 100%
rename from .containers/apps/ombi/Dockerfile
rename to containers/apps/ombi/Dockerfile
diff --git a/.containers/apps/ombi/VERSION b/containers/apps/ombi/VERSION
similarity index 100%
rename from .containers/apps/ombi/VERSION
rename to containers/apps/ombi/VERSION
diff --git a/.containers/apps/ombi/entrypoint.sh b/containers/apps/ombi/entrypoint.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/apps/ombi/entrypoint.sh
rename to containers/apps/ombi/entrypoint.sh
diff --git a/.containers/apps/ombi/latest-base.sh b/containers/apps/ombi/latest-base.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/apps/ombi/latest-base.sh
rename to containers/apps/ombi/latest-base.sh
diff --git a/.containers/apps/ombi/latest-version.sh b/containers/apps/ombi/latest-version.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/apps/ombi/latest-version.sh
rename to containers/apps/ombi/latest-version.sh
diff --git a/.containers/apps/plex/Dockerfile b/containers/apps/plex/Dockerfile
similarity index 100%
rename from .containers/apps/plex/Dockerfile
rename to containers/apps/plex/Dockerfile
diff --git a/.containers/apps/plex/README.md b/containers/apps/plex/README.md
similarity index 100%
rename from .containers/apps/plex/README.md
rename to containers/apps/plex/README.md
diff --git a/.containers/apps/plex/VERSION b/containers/apps/plex/VERSION
similarity index 100%
rename from .containers/apps/plex/VERSION
rename to containers/apps/plex/VERSION
diff --git a/.containers/apps/plex/entrypoint.sh b/containers/apps/plex/entrypoint.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/apps/plex/entrypoint.sh
rename to containers/apps/plex/entrypoint.sh
diff --git a/.containers/apps/plex/goss.yaml b/containers/apps/plex/goss.yaml
similarity index 100%
rename from .containers/apps/plex/goss.yaml
rename to containers/apps/plex/goss.yaml
diff --git a/.containers/apps/plex/latest-version.sh b/containers/apps/plex/latest-version.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/apps/plex/latest-version.sh
rename to containers/apps/plex/latest-version.sh
diff --git a/.containers/apps/plex/shim/plex-preferences.sh b/containers/apps/plex/shim/plex-preferences.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/apps/plex/shim/plex-preferences.sh
rename to containers/apps/plex/shim/plex-preferences.sh
diff --git a/.containers/apps/qbittorrent/Dockerfile b/containers/apps/qbittorrent/Dockerfile
similarity index 100%
rename from .containers/apps/qbittorrent/Dockerfile
rename to containers/apps/qbittorrent/Dockerfile
diff --git a/.containers/apps/qbittorrent/VERSION b/containers/apps/qbittorrent/VERSION
similarity index 100%
rename from .containers/apps/qbittorrent/VERSION
rename to containers/apps/qbittorrent/VERSION
diff --git a/.containers/apps/qbittorrent/entrypoint.sh b/containers/apps/qbittorrent/entrypoint.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/apps/qbittorrent/entrypoint.sh
rename to containers/apps/qbittorrent/entrypoint.sh
diff --git a/.containers/apps/qbittorrent/goss.yaml b/containers/apps/qbittorrent/goss.yaml
similarity index 100%
rename from .containers/apps/qbittorrent/goss.yaml
rename to containers/apps/qbittorrent/goss.yaml
diff --git a/.containers/apps/qbittorrent/latest-version.sh b/containers/apps/qbittorrent/latest-version.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/apps/qbittorrent/latest-version.sh
rename to containers/apps/qbittorrent/latest-version.sh
diff --git a/.containers/apps/qbittorrent/qBittorrent.conf b/containers/apps/qbittorrent/qBittorrent.conf
similarity index 100%
rename from .containers/apps/qbittorrent/qBittorrent.conf
rename to containers/apps/qbittorrent/qBittorrent.conf
diff --git a/.containers/apps/radarr/Dockerfile b/containers/apps/radarr/Dockerfile
similarity index 100%
rename from .containers/apps/radarr/Dockerfile
rename to containers/apps/radarr/Dockerfile
diff --git a/.containers/apps/radarr/VERSION b/containers/apps/radarr/VERSION
similarity index 100%
rename from .containers/apps/radarr/VERSION
rename to containers/apps/radarr/VERSION
diff --git a/.containers/apps/radarr/entrypoint.sh b/containers/apps/radarr/entrypoint.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/apps/radarr/entrypoint.sh
rename to containers/apps/radarr/entrypoint.sh
diff --git a/.containers/apps/radarr/goss.yaml b/containers/apps/radarr/goss.yaml
similarity index 100%
rename from .containers/apps/radarr/goss.yaml
rename to containers/apps/radarr/goss.yaml
diff --git a/.containers/apps/radarr/latest-version.sh b/containers/apps/radarr/latest-version.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/apps/radarr/latest-version.sh
rename to containers/apps/radarr/latest-version.sh
diff --git a/.containers/apps/readarr/Dockerfile b/containers/apps/readarr/Dockerfile
similarity index 100%
rename from .containers/apps/readarr/Dockerfile
rename to containers/apps/readarr/Dockerfile
diff --git a/.containers/apps/readarr/VERSION b/containers/apps/readarr/VERSION
similarity index 100%
rename from .containers/apps/readarr/VERSION
rename to containers/apps/readarr/VERSION
diff --git a/.containers/apps/readarr/entrypoint.sh b/containers/apps/readarr/entrypoint.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/apps/readarr/entrypoint.sh
rename to containers/apps/readarr/entrypoint.sh
diff --git a/.containers/apps/readarr/goss.yaml b/containers/apps/readarr/goss.yaml
similarity index 100%
rename from .containers/apps/readarr/goss.yaml
rename to containers/apps/readarr/goss.yaml
diff --git a/.containers/apps/readarr/latest-version.sh b/containers/apps/readarr/latest-version.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/apps/readarr/latest-version.sh
rename to containers/apps/readarr/latest-version.sh
diff --git a/.containers/apps/sabnzbd/Dockerfile b/containers/apps/sabnzbd/Dockerfile
similarity index 100%
rename from .containers/apps/sabnzbd/Dockerfile
rename to containers/apps/sabnzbd/Dockerfile
diff --git a/.containers/apps/sabnzbd/VERSION b/containers/apps/sabnzbd/VERSION
similarity index 100%
rename from .containers/apps/sabnzbd/VERSION
rename to containers/apps/sabnzbd/VERSION
diff --git a/.containers/apps/sabnzbd/entrypoint.sh b/containers/apps/sabnzbd/entrypoint.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/apps/sabnzbd/entrypoint.sh
rename to containers/apps/sabnzbd/entrypoint.sh
diff --git a/.containers/apps/sabnzbd/goss.yaml b/containers/apps/sabnzbd/goss.yaml
similarity index 100%
rename from .containers/apps/sabnzbd/goss.yaml
rename to containers/apps/sabnzbd/goss.yaml
diff --git a/.containers/apps/sabnzbd/latest-version.sh b/containers/apps/sabnzbd/latest-version.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/apps/sabnzbd/latest-version.sh
rename to containers/apps/sabnzbd/latest-version.sh
diff --git a/.containers/apps/sabnzbd/sabnzbd.ini b/containers/apps/sabnzbd/sabnzbd.ini
similarity index 100%
rename from .containers/apps/sabnzbd/sabnzbd.ini
rename to containers/apps/sabnzbd/sabnzbd.ini
diff --git a/.containers/apps/sonarr/Dockerfile b/containers/apps/sonarr/Dockerfile
similarity index 100%
rename from .containers/apps/sonarr/Dockerfile
rename to containers/apps/sonarr/Dockerfile
diff --git a/.containers/apps/sonarr/VERSION b/containers/apps/sonarr/VERSION
similarity index 100%
rename from .containers/apps/sonarr/VERSION
rename to containers/apps/sonarr/VERSION
diff --git a/.containers/apps/sonarr/entrypoint.sh b/containers/apps/sonarr/entrypoint.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/apps/sonarr/entrypoint.sh
rename to containers/apps/sonarr/entrypoint.sh
diff --git a/.containers/apps/sonarr/goss.yaml b/containers/apps/sonarr/goss.yaml
similarity index 100%
rename from .containers/apps/sonarr/goss.yaml
rename to containers/apps/sonarr/goss.yaml
diff --git a/.containers/apps/sonarr/latest-version.sh b/containers/apps/sonarr/latest-version.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/apps/sonarr/latest-version.sh
rename to containers/apps/sonarr/latest-version.sh
diff --git a/.containers/apps/tautulli/Dockerfile b/containers/apps/tautulli/Dockerfile
similarity index 100%
rename from .containers/apps/tautulli/Dockerfile
rename to containers/apps/tautulli/Dockerfile
diff --git a/.containers/apps/tautulli/VERSION b/containers/apps/tautulli/VERSION
similarity index 100%
rename from .containers/apps/tautulli/VERSION
rename to containers/apps/tautulli/VERSION
diff --git a/.containers/apps/tautulli/entrypoint.sh b/containers/apps/tautulli/entrypoint.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/apps/tautulli/entrypoint.sh
rename to containers/apps/tautulli/entrypoint.sh
diff --git a/.containers/apps/tautulli/goss.yaml b/containers/apps/tautulli/goss.yaml
similarity index 100%
rename from .containers/apps/tautulli/goss.yaml
rename to containers/apps/tautulli/goss.yaml
diff --git a/.containers/apps/tautulli/latest-version.sh b/containers/apps/tautulli/latest-version.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/apps/tautulli/latest-version.sh
rename to containers/apps/tautulli/latest-version.sh
diff --git a/.containers/apps/transmission/Dockerfile b/containers/apps/transmission/Dockerfile
similarity index 100%
rename from .containers/apps/transmission/Dockerfile
rename to containers/apps/transmission/Dockerfile
diff --git a/.containers/apps/transmission/VERSION b/containers/apps/transmission/VERSION
similarity index 100%
rename from .containers/apps/transmission/VERSION
rename to containers/apps/transmission/VERSION
diff --git a/.containers/apps/transmission/entrypoint.sh b/containers/apps/transmission/entrypoint.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/apps/transmission/entrypoint.sh
rename to containers/apps/transmission/entrypoint.sh
diff --git a/.containers/apps/transmission/goss.yaml b/containers/apps/transmission/goss.yaml
similarity index 100%
rename from .containers/apps/transmission/goss.yaml
rename to containers/apps/transmission/goss.yaml
diff --git a/.containers/apps/transmission/latest-version.sh b/containers/apps/transmission/latest-version.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/apps/transmission/latest-version.sh
rename to containers/apps/transmission/latest-version.sh
diff --git a/containers/base/alpine/.gitkeep b/containers/base/alpine/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/.containers/base/alpine/Dockerfile b/containers/base/alpine/Dockerfile
similarity index 100%
rename from .containers/base/alpine/Dockerfile
rename to containers/base/alpine/Dockerfile
diff --git a/.containers/base/alpine/PLATFORM b/containers/base/alpine/PLATFORM
similarity index 100%
rename from .containers/base/alpine/PLATFORM
rename to containers/base/alpine/PLATFORM
diff --git a/.containers/base/alpine/VERSION b/containers/base/alpine/VERSION
similarity index 100%
rename from .containers/base/alpine/VERSION
rename to containers/base/alpine/VERSION
diff --git a/.containers/base/alpine/latest-version.sh b/containers/base/alpine/latest-version.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/base/alpine/latest-version.sh
rename to containers/base/alpine/latest-version.sh
diff --git a/.containers/base/ubuntu/Dockerfile b/containers/base/ubuntu/Dockerfile
similarity index 100%
rename from .containers/base/ubuntu/Dockerfile
rename to containers/base/ubuntu/Dockerfile
diff --git a/.containers/base/ubuntu/PLATFORM b/containers/base/ubuntu/PLATFORM
similarity index 100%
rename from .containers/base/ubuntu/PLATFORM
rename to containers/base/ubuntu/PLATFORM
diff --git a/.containers/base/ubuntu/VERSION b/containers/base/ubuntu/VERSION
similarity index 100%
rename from .containers/base/ubuntu/VERSION
rename to containers/base/ubuntu/VERSION
diff --git a/.containers/base/ubuntu/latest-version.sh b/containers/base/ubuntu/latest-version.sh
old mode 100755
new mode 100644
similarity index 100%
rename from .containers/base/ubuntu/latest-version.sh
rename to containers/base/ubuntu/latest-version.sh