diff --git a/atlassian/bitbucket/latest/.docker-repository.yml b/atlassian/bitbucket/latest/.docker-repository.yml
deleted file mode 100644
index 6a0e5da83..000000000
--- a/atlassian/bitbucket/latest/.docker-repository.yml
+++ /dev/null
@@ -1 +0,0 @@
-repository: epicmorg/bitbucket
diff --git a/atlassian/bitbucket/latest/.dockerignore b/atlassian/bitbucket/latest/.dockerignore
deleted file mode 100644
index f5523d40c..000000000
--- a/atlassian/bitbucket/latest/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.git
-scripts
-.idea
diff --git a/atlassian/bitbucket/latest/bitbucket-pipelines.yml b/atlassian/bitbucket/latest/bitbucket-pipelines.yml
deleted file mode 100644
index 231d79e9e..000000000
--- a/atlassian/bitbucket/latest/bitbucket-pipelines.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-image: dchevell/docker-release-maker:latest
-clone:
-  depth: full
-
-pipelines:
-  custom:
-    create-release-base-5:
-      - step:
-          script:
-            - git remote set-url origin ${BITBUCKET_GIT_HTTP_ORIGIN}
-            - git fetch --all
-            - export BASE_BRANCH='base-5'
-            - export MAC_PRODUCT_KEY='bitbucket'
-            - export DOCKERFILE_VERSION_STRING='BITBUCKET_VERSION'
-            - export DEFAULT_RELEASE='true'
-            - export ADDITIONAL_TAG_SUFFIXES='alpine'
-            - python /usr/src/app/run.py --create
-    create-release-base-6:
-      - step:
-          script:
-            - git remote set-url origin ${BITBUCKET_GIT_HTTP_ORIGIN}
-            - git fetch --all
-            - export BASE_BRANCH='base-6'
-            - export MAC_PRODUCT_KEY='bitbucket'
-            - export DOCKERFILE_VERSION_STRING='BITBUCKET_VERSION'
-            - export DEFAULT_RELEASE='true'
-            - export ADDITIONAL_TAG_SUFFIXES='jdk8,ubuntu'
-            - python /usr/src/app/run.py --create
-    test:
-      - step:
-          image: docker:stable-git
-          script:
-            # Run bitbucket docker image
-            - mkdir -p data
-            - |
-                docker run -v $(pwd)/data:/var/atlassian/application-data/bitbucket \
-                  --name="bitbucket" -d -p 7990:7990 -p 7999:7999 atlassian/bitbucket-server
-            # Run tests
-            - git show origin/scripts:scripts/test-bitbucket-status.sh | install -m 0755 /dev/fd/0 test-bitbucket-status.sh
-            - ./test-bitbucket-status.sh
-          services:
-            - docker
-
-  branches:
-    base-5:
-      - step:
-          script:
-            - git remote set-url origin ${BITBUCKET_GIT_HTTP_ORIGIN}
-            - git fetch --all
-            - export BASE_BRANCH='base-5'
-            - export MAC_PRODUCT_KEY='bitbucket'
-            - export DOCKERFILE_VERSION_STRING='BITBUCKET_VERSION'
-            - export DEFAULT_RELEASE='true'
-            - export ADDITIONAL_TAG_SUFFIXES='alpine'
-            - python /usr/src/app/run.py --update
-    base-6:
-      - step:
-          script:
-            - git remote set-url origin ${BITBUCKET_GIT_HTTP_ORIGIN}
-            - git fetch --all
-            - export BASE_BRANCH='base-6'
-            - export MAC_PRODUCT_KEY='bitbucket'
-            - export DOCKERFILE_VERSION_STRING='BITBUCKET_VERSION'
-            - export DEFAULT_RELEASE='true'
-            - export ADDITIONAL_TAG_SUFFIXES='jdk8,ubuntu'
-            - python /usr/src/app/run.py --update
diff --git a/atlassian/confluence/latest/.docker-repository.yml b/atlassian/confluence/latest/.docker-repository.yml
deleted file mode 100644
index efb9f8b2d..000000000
--- a/atlassian/confluence/latest/.docker-repository.yml
+++ /dev/null
@@ -1 +0,0 @@
-repository: epicmorg/confluence
diff --git a/atlassian/confluence/latest/.dockerignore b/atlassian/confluence/latest/.dockerignore
deleted file mode 100644
index 99176b278..000000000
--- a/atlassian/confluence/latest/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.git
-scripts
-.idea
\ No newline at end of file
diff --git a/atlassian/jira/latest/.docker-repository.yml b/atlassian/jira/latest/.docker-repository.yml
deleted file mode 100644
index 8dc515604..000000000
--- a/atlassian/jira/latest/.docker-repository.yml
+++ /dev/null
@@ -1 +0,0 @@
-repository: epicmorg/jira
diff --git a/atlassian/jira/latest/.dockerignore b/atlassian/jira/latest/.dockerignore
deleted file mode 100644
index 99176b278..000000000
--- a/atlassian/jira/latest/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.git
-scripts
-.idea
\ No newline at end of file
diff --git a/balancer/latest/.docker-repository.yml b/balancer/latest/.docker-repository.yml
deleted file mode 100644
index 6bf9e2675..000000000
--- a/balancer/latest/.docker-repository.yml
+++ /dev/null
@@ -1 +0,0 @@
-repository: epicmorg/balancer
diff --git a/balancer/latest/.dockerignore b/balancer/latest/.dockerignore
deleted file mode 100644
index f5523d40c..000000000
--- a/balancer/latest/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.git
-scripts
-.idea
diff --git a/balancer/php/.docker-repository.yml b/balancer/php/.docker-repository.yml
deleted file mode 100644
index 6bf9e2675..000000000
--- a/balancer/php/.docker-repository.yml
+++ /dev/null
@@ -1 +0,0 @@
-repository: epicmorg/balancer
diff --git a/balancer/php/.dockerignore b/balancer/php/.dockerignore
deleted file mode 100644
index f5523d40c..000000000
--- a/balancer/php/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.git
-scripts
-.idea
diff --git a/epicmorg/devel/jdk11/.docker-repository.yml b/epicmorg/devel/jdk11/.docker-repository.yml
deleted file mode 100644
index 9ab554e4d..000000000
--- a/epicmorg/devel/jdk11/.docker-repository.yml
+++ /dev/null
@@ -1 +0,0 @@
-repository: epicmorg/devel
diff --git a/epicmorg/devel/jdk11/.dockerignore b/epicmorg/devel/jdk11/.dockerignore
deleted file mode 100644
index 99176b278..000000000
--- a/epicmorg/devel/jdk11/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.git
-scripts
-.idea
\ No newline at end of file
diff --git a/epicmorg/devel/jdk6/.docker-repository.yml b/epicmorg/devel/jdk6/.docker-repository.yml
deleted file mode 100644
index 1e50bcd0a..000000000
--- a/epicmorg/devel/jdk6/.docker-repository.yml
+++ /dev/null
@@ -1 +0,0 @@
-repository: epicmorg/prod
diff --git a/epicmorg/devel/jdk6/.dockerignore b/epicmorg/devel/jdk6/.dockerignore
deleted file mode 100644
index 99176b278..000000000
--- a/epicmorg/devel/jdk6/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.git
-scripts
-.idea
\ No newline at end of file
diff --git a/epicmorg/devel/jdk7/.docker-repository.yml b/epicmorg/devel/jdk7/.docker-repository.yml
deleted file mode 100644
index 1e50bcd0a..000000000
--- a/epicmorg/devel/jdk7/.docker-repository.yml
+++ /dev/null
@@ -1 +0,0 @@
-repository: epicmorg/prod
diff --git a/epicmorg/devel/jdk7/.dockerignore b/epicmorg/devel/jdk7/.dockerignore
deleted file mode 100644
index 99176b278..000000000
--- a/epicmorg/devel/jdk7/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.git
-scripts
-.idea
\ No newline at end of file
diff --git a/epicmorg/devel/jdk8/.docker-repository.yml b/epicmorg/devel/jdk8/.docker-repository.yml
deleted file mode 100644
index 9ab554e4d..000000000
--- a/epicmorg/devel/jdk8/.docker-repository.yml
+++ /dev/null
@@ -1 +0,0 @@
-repository: epicmorg/devel
diff --git a/epicmorg/devel/jdk8/.dockerignore b/epicmorg/devel/jdk8/.dockerignore
deleted file mode 100644
index 99176b278..000000000
--- a/epicmorg/devel/jdk8/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.git
-scripts
-.idea
\ No newline at end of file
diff --git a/epicmorg/devel/main/.docker-repository.yml b/epicmorg/devel/main/.docker-repository.yml
deleted file mode 100644
index 9ab554e4d..000000000
--- a/epicmorg/devel/main/.docker-repository.yml
+++ /dev/null
@@ -1 +0,0 @@
-repository: epicmorg/devel
diff --git a/epicmorg/devel/main/.dockerignore b/epicmorg/devel/main/.dockerignore
deleted file mode 100644
index 99176b278..000000000
--- a/epicmorg/devel/main/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.git
-scripts
-.idea
\ No newline at end of file
diff --git a/epicmorg/edge/jdk11/.docker-repository.yml b/epicmorg/edge/jdk11/.docker-repository.yml
deleted file mode 100644
index 7d6511aa9..000000000
--- a/epicmorg/edge/jdk11/.docker-repository.yml
+++ /dev/null
@@ -1 +0,0 @@
-repository: epicmorg/edge
diff --git a/epicmorg/edge/jdk11/.dockerignore b/epicmorg/edge/jdk11/.dockerignore
deleted file mode 100644
index 99176b278..000000000
--- a/epicmorg/edge/jdk11/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.git
-scripts
-.idea
\ No newline at end of file
diff --git a/epicmorg/edge/jdk6/.docker-repository.yml b/epicmorg/edge/jdk6/.docker-repository.yml
deleted file mode 100644
index 1e50bcd0a..000000000
--- a/epicmorg/edge/jdk6/.docker-repository.yml
+++ /dev/null
@@ -1 +0,0 @@
-repository: epicmorg/prod
diff --git a/epicmorg/edge/jdk6/.dockerignore b/epicmorg/edge/jdk6/.dockerignore
deleted file mode 100644
index 99176b278..000000000
--- a/epicmorg/edge/jdk6/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.git
-scripts
-.idea
\ No newline at end of file
diff --git a/epicmorg/edge/jdk7/.docker-repository.yml b/epicmorg/edge/jdk7/.docker-repository.yml
deleted file mode 100644
index 1e50bcd0a..000000000
--- a/epicmorg/edge/jdk7/.docker-repository.yml
+++ /dev/null
@@ -1 +0,0 @@
-repository: epicmorg/prod
diff --git a/epicmorg/edge/jdk7/.dockerignore b/epicmorg/edge/jdk7/.dockerignore
deleted file mode 100644
index 99176b278..000000000
--- a/epicmorg/edge/jdk7/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.git
-scripts
-.idea
\ No newline at end of file
diff --git a/epicmorg/edge/jdk8/.docker-repository.yml b/epicmorg/edge/jdk8/.docker-repository.yml
deleted file mode 100644
index 7d6511aa9..000000000
--- a/epicmorg/edge/jdk8/.docker-repository.yml
+++ /dev/null
@@ -1 +0,0 @@
-repository: epicmorg/edge
diff --git a/epicmorg/edge/jdk8/.dockerignore b/epicmorg/edge/jdk8/.dockerignore
deleted file mode 100644
index 99176b278..000000000
--- a/epicmorg/edge/jdk8/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.git
-scripts
-.idea
\ No newline at end of file
diff --git a/epicmorg/edge/main/.docker-repository.yml b/epicmorg/edge/main/.docker-repository.yml
deleted file mode 100644
index 7d6511aa9..000000000
--- a/epicmorg/edge/main/.docker-repository.yml
+++ /dev/null
@@ -1 +0,0 @@
-repository: epicmorg/edge
diff --git a/epicmorg/edge/main/.dockerignore b/epicmorg/edge/main/.dockerignore
deleted file mode 100644
index 99176b278..000000000
--- a/epicmorg/edge/main/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.git
-scripts
-.idea
\ No newline at end of file
diff --git a/epicmorg/prod/jdk11/.docker-repository.yml b/epicmorg/prod/jdk11/.docker-repository.yml
deleted file mode 100644
index 1e50bcd0a..000000000
--- a/epicmorg/prod/jdk11/.docker-repository.yml
+++ /dev/null
@@ -1 +0,0 @@
-repository: epicmorg/prod
diff --git a/epicmorg/prod/jdk11/.dockerignore b/epicmorg/prod/jdk11/.dockerignore
deleted file mode 100644
index 99176b278..000000000
--- a/epicmorg/prod/jdk11/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.git
-scripts
-.idea
\ No newline at end of file
diff --git a/epicmorg/prod/jdk6/.docker-repository.yml b/epicmorg/prod/jdk6/.docker-repository.yml
deleted file mode 100644
index 1e50bcd0a..000000000
--- a/epicmorg/prod/jdk6/.docker-repository.yml
+++ /dev/null
@@ -1 +0,0 @@
-repository: epicmorg/prod
diff --git a/epicmorg/prod/jdk6/.dockerignore b/epicmorg/prod/jdk6/.dockerignore
deleted file mode 100644
index 99176b278..000000000
--- a/epicmorg/prod/jdk6/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.git
-scripts
-.idea
\ No newline at end of file
diff --git a/epicmorg/prod/jdk7/.docker-repository.yml b/epicmorg/prod/jdk7/.docker-repository.yml
deleted file mode 100644
index 1e50bcd0a..000000000
--- a/epicmorg/prod/jdk7/.docker-repository.yml
+++ /dev/null
@@ -1 +0,0 @@
-repository: epicmorg/prod
diff --git a/epicmorg/prod/jdk7/.dockerignore b/epicmorg/prod/jdk7/.dockerignore
deleted file mode 100644
index 99176b278..000000000
--- a/epicmorg/prod/jdk7/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.git
-scripts
-.idea
\ No newline at end of file
diff --git a/epicmorg/prod/jdk8/.docker-repository.yml b/epicmorg/prod/jdk8/.docker-repository.yml
deleted file mode 100644
index 1e50bcd0a..000000000
--- a/epicmorg/prod/jdk8/.docker-repository.yml
+++ /dev/null
@@ -1 +0,0 @@
-repository: epicmorg/prod
diff --git a/epicmorg/prod/jdk8/.dockerignore b/epicmorg/prod/jdk8/.dockerignore
deleted file mode 100644
index 99176b278..000000000
--- a/epicmorg/prod/jdk8/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.git
-scripts
-.idea
\ No newline at end of file
diff --git a/epicmorg/prod/main/.docker-repository.yml b/epicmorg/prod/main/.docker-repository.yml
deleted file mode 100644
index 1e50bcd0a..000000000
--- a/epicmorg/prod/main/.docker-repository.yml
+++ /dev/null
@@ -1 +0,0 @@
-repository: epicmorg/prod
diff --git a/epicmorg/prod/main/.dockerignore b/epicmorg/prod/main/.dockerignore
deleted file mode 100644
index 99176b278..000000000
--- a/epicmorg/prod/main/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.git
-scripts
-.idea
\ No newline at end of file
diff --git a/nextcloud/latest/.docker-repository.yml b/nextcloud/latest/.docker-repository.yml
deleted file mode 100644
index 7e8e1f859..000000000
--- a/nextcloud/latest/.docker-repository.yml
+++ /dev/null
@@ -1 +0,0 @@
-repository: epicmorg/nextcloud
diff --git a/nextcloud/latest/.dockerignore b/nextcloud/latest/.dockerignore
deleted file mode 100644
index f5523d40c..000000000
--- a/nextcloud/latest/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.git
-scripts
-.idea
diff --git a/qbittorrent/latest/.docker-repository.yml b/qbittorrent/latest/.docker-repository.yml
deleted file mode 100644
index 78e948324..000000000
--- a/qbittorrent/latest/.docker-repository.yml
+++ /dev/null
@@ -1 +0,0 @@
-repository: epicmorg/qbittorrent
diff --git a/qbittorrent/latest/.dockerignore b/qbittorrent/latest/.dockerignore
deleted file mode 100644
index 99176b278..000000000
--- a/qbittorrent/latest/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.git
-scripts
-.idea
\ No newline at end of file
diff --git a/qbittorrent/stable/.docker-repository.yml b/qbittorrent/stable/.docker-repository.yml
deleted file mode 100644
index 78e948324..000000000
--- a/qbittorrent/stable/.docker-repository.yml
+++ /dev/null
@@ -1 +0,0 @@
-repository: epicmorg/qbittorrent
diff --git a/qbittorrent/stable/.dockerignore b/qbittorrent/stable/.dockerignore
deleted file mode 100644
index 99176b278..000000000
--- a/qbittorrent/stable/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.git
-scripts
-.idea
\ No newline at end of file
diff --git a/websites/latest/.docker-repository.yml b/websites/latest/.docker-repository.yml
deleted file mode 100644
index f5f1c309b..000000000
--- a/websites/latest/.docker-repository.yml
+++ /dev/null
@@ -1 +0,0 @@
-repository: epicmorg/websites
diff --git a/websites/latest/.dockerignore b/websites/latest/.dockerignore
deleted file mode 100644
index f5523d40c..000000000
--- a/websites/latest/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.git
-scripts
-.idea
diff --git a/websites/php7.2/.docker-repository.yml b/websites/php7.2/.docker-repository.yml
deleted file mode 100644
index f5f1c309b..000000000
--- a/websites/php7.2/.docker-repository.yml
+++ /dev/null
@@ -1 +0,0 @@
-repository: epicmorg/websites
diff --git a/websites/php7.2/.dockerignore b/websites/php7.2/.dockerignore
deleted file mode 100644
index f5523d40c..000000000
--- a/websites/php7.2/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.git
-scripts
-.idea
diff --git a/zabbix/agent/.docker-repository.yml b/zabbix/agent/.docker-repository.yml
deleted file mode 100644
index 60ab0dd84..000000000
--- a/zabbix/agent/.docker-repository.yml
+++ /dev/null
@@ -1 +0,0 @@
-repository: epicmorg/zabbix-agent
diff --git a/zabbix/agent/.dockerignore b/zabbix/agent/.dockerignore
deleted file mode 100644
index f5523d40c..000000000
--- a/zabbix/agent/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.git
-scripts
-.idea
diff --git a/zabbix/java-gateway/.docker-repository.yml b/zabbix/java-gateway/.docker-repository.yml
deleted file mode 100644
index d14b236d1..000000000
--- a/zabbix/java-gateway/.docker-repository.yml
+++ /dev/null
@@ -1 +0,0 @@
-repository: epicmorg/zabbix-java-gateway
diff --git a/zabbix/java-gateway/.dockerignore b/zabbix/java-gateway/.dockerignore
deleted file mode 100644
index f5523d40c..000000000
--- a/zabbix/java-gateway/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.git
-scripts
-.idea
diff --git a/zabbix/server/.docker-repository.yml b/zabbix/server/.docker-repository.yml
deleted file mode 100644
index 8d29a202d..000000000
--- a/zabbix/server/.docker-repository.yml
+++ /dev/null
@@ -1 +0,0 @@
-repository: epicmorg/zabbix-server-mysql
diff --git a/zabbix/server/.dockerignore b/zabbix/server/.dockerignore
deleted file mode 100644
index f5523d40c..000000000
--- a/zabbix/server/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.git
-scripts
-.idea
diff --git a/zabbix/web/.docker-repository.yml b/zabbix/web/.docker-repository.yml
deleted file mode 100644
index aaefbbe3d..000000000
--- a/zabbix/web/.docker-repository.yml
+++ /dev/null
@@ -1 +0,0 @@
-repository: epicmorg/zabbix-web-apache-mysql
diff --git a/zabbix/web/.dockerignore b/zabbix/web/.dockerignore
deleted file mode 100644
index f5523d40c..000000000
--- a/zabbix/web/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.git
-scripts
-.idea