diff --git a/_vm/etc/apk/repositories b/_vm/etc/apk/repositories
index b48eb01..82f3c48 100644
--- a/_vm/etc/apk/repositories
+++ b/_vm/etc/apk/repositories
@@ -1,4 +1,3 @@
 http://dl-cdn.alpinelinux.org/alpine/v3.9/main
 http://dl-cdn.alpinelinux.org/alpine/v3.9/community
-@et http://dl-cdn.alpinelinux.org/alpine/edge/testing
-@vm https://repo.spotter.cz/apk
+@vm http://repo.spotter.cz/apk
diff --git a/lxc-apps/ckan/lxcfile b/lxc-apps/ckan/lxcfile
index 4f10357..fb7162a 100644
--- a/lxc-apps/ckan/lxcfile
+++ b/lxc-apps/ckan/lxcfile
@@ -5,7 +5,7 @@ LAYER ckan/ckan
 
 RUN EOF
     # Install runtime dependencies
-    apk --no-cache add geos@et libjpeg-turbo libmagic libpq mailcap py2-pip zlib
+    apk --no-cache add geos libjpeg-turbo libmagic libpq mailcap py2-pip zlib
 
     # Install build dependencies
     apk --no-cache add --virtual .deps build-base git libjpeg-turbo-dev libxml2-dev libxslt-dev postgresql-dev python2-dev zlib-dev
diff --git a/lxc-apps/cts/lxcfile b/lxc-apps/cts/lxcfile
index 43871d2..19a1d82 100644
--- a/lxc-apps/cts/lxcfile
+++ b/lxc-apps/cts/lxcfile
@@ -5,7 +5,7 @@ LAYER cts/cts
 
 RUN EOF
     # Install runtime dependencies
-    apk --no-cache add geos@et libpq nginx zlib
+    apk --no-cache add geos libpq nginx zlib
 
     # Install build dependencies
     apk --no-cache add --virtual .deps build-base git postgresql-dev python2-dev py2-pip zlib-dev
diff --git a/lxc-apps/sahana-shared/lxcfile b/lxc-apps/sahana-shared/lxcfile
index 712dd85..540537c 100644
--- a/lxc-apps/sahana-shared/lxcfile
+++ b/lxc-apps/sahana-shared/lxcfile
@@ -5,7 +5,7 @@ LAYER shared/sahana
 
 RUN EOF
     # Install runtime dependencies
-    apk --no-cache add geos@et nginx py-gdal@et py2-dateutil py2-lxml py2-numpy py2-pillow py2-psycopg2 py2-requests uwsgi-python
+    apk --no-cache add geos nginx py-gdal py2-dateutil py2-lxml py2-numpy py2-pillow py2-psycopg2 py2-requests uwsgi-python
 
     # Install build dependencies
     apk --no-cache add --virtual .deps build-base git freetype-dev libpng-dev py-numpy-dev py2-pip python2-dev ttf-dejavu
diff --git a/lxc-services/postgres/lxcfile b/lxc-services/postgres/lxcfile
index 28ce68c..8790937 100644
--- a/lxc-services/postgres/lxcfile
+++ b/lxc-services/postgres/lxcfile
@@ -8,7 +8,7 @@ RUN EOF
     sed -i 's/postgres:x:70/postgres:x:5432/' /etc/group
 
     # Install PostgreSQL + PostGIS
-    apk --no-cache add postgresql postgresql-contrib postgis@et
+    apk --no-cache add postgresql postgresql-contrib postgis
 
     # Create socket directory 
     mkdir /run/postgresql
diff --git a/lxc-services/rabbitmq/lxcfile b/lxc-services/rabbitmq/lxcfile
index 63acb0b..dbad1d6 100644
--- a/lxc-services/rabbitmq/lxcfile
+++ b/lxc-services/rabbitmq/lxcfile
@@ -8,7 +8,7 @@ RUN EOF
     adduser -S -u 5672 -h /usr/lib/rabbitmq -s /bin/false -g rabbitmq -G rabbitmq rabbitmq
 
     # Install RabbitMQ
-    apk --no-cache add rabbitmq-server@et
+    apk --no-cache add rabbitmq-server
 EOF
 
 MOUNT DIR /srv/rabbitmq/data var/lib/rabbitmq/mnesia
diff --git a/lxc-shared/alpine3.8/lxcfile b/lxc-shared/alpine3.8/lxcfile
index 602f05a..057de70 100644
--- a/lxc-shared/alpine3.8/lxcfile
+++ b/lxc-shared/alpine3.8/lxcfile
@@ -3,14 +3,12 @@ LAYER shared/alpine3.8
 COPY https://github.com/gliderlabs/docker-alpine/raw/rootfs/library-3.8/x86_64/versions/library-3.8/x86_64/rootfs.tar.xz
 
 RUN EOF
-    # Add edge/testing repository
-    echo '@em http://dl-cdn.alpinelinux.org/alpine/edge/main' >>/etc/apk/repositories
-    echo '@et http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories
-    echo '@ec http://dl-cdn.alpinelinux.org/alpine/edge/community' >>/etc/apk/repositories
+    # Add spotter repository
+    echo 'http://repo.spotter.cz/apk' >>/etc/apk/repositories
 
     # Update packages
     apk --no-cache upgrade
 
     # Install s6 supervisor
-    apk --no-cache add libxml2 libxslt s6@em
+    apk --no-cache add libxml2 libxslt s6
 EOF
diff --git a/lxc-shared/alpine3.9/lxcfile b/lxc-shared/alpine3.9/lxcfile
index b97be4e..6788fa1 100644
--- a/lxc-shared/alpine3.9/lxcfile
+++ b/lxc-shared/alpine3.9/lxcfile
@@ -3,10 +3,8 @@ LAYER shared/alpine3.9
 COPY https://github.com/gliderlabs/docker-alpine/raw/rootfs/library-3.9/x86_64/versions/library-3.9/x86_64/rootfs.tar.xz
 
 RUN EOF
-    # Add edge/testing repository
-    echo '@em http://dl-cdn.alpinelinux.org/alpine/edge/main' >>/etc/apk/repositories
-    echo '@et http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories
-    echo '@ec http://dl-cdn.alpinelinux.org/alpine/edge/community' >>/etc/apk/repositories
+    # Add spotter repository
+    echo 'http://repo.spotter.cz/apk' >>/etc/apk/repositories
 
     # Update packages
     apk --no-cache upgrade