diff --git a/gogs/arm/Dockerfile b/gogs/arm/Dockerfile
index fb221eb..978e8fb 100644
--- a/gogs/arm/Dockerfile
+++ b/gogs/arm/Dockerfile
@@ -30,9 +30,10 @@ RUN set -xe \
 RUN set -xe \
     && mkdir /app/ \
     && cd /app/ \
-    && curl -LO https://github.com/gogits/gogs/releases/download/v${GOGS_VERSION}/linux_armv6.zip \
-    && unzip linux_armv6.zip \
-    && rm linux_armv6.zip
+    && curl -LO https://github.com/gogits/gogs/releases/download/v${GOGS_VERSION}/raspi2.zip \
+    && unzip raspi2.zip \
+    && rm raspi2.zip \
+    && ln -s /lib/libc.musl-armhf.so.1 /lib/ld-linux-armhf.so.3
 
 RUN set -xe \
     && cd /app/gogs/ \
diff --git a/gogs/arm/docker-compose.yml b/gogs/arm/docker-compose.yml
index bf1b3cf..00f2567 100644
--- a/gogs/arm/docker-compose.yml
+++ b/gogs/arm/docker-compose.yml
@@ -5,26 +5,4 @@ gogs:
     - "3000:3000"
   volumes:
     - ./data:/data
-  links:
-    - mysql
-  restart: always
-
-mysql:
-  image: easypi/mariadb-arm
-  ports:
-    - "3306:3306"
-  environment:
-    - MYSQL_ROOT_PASSWORD=root
-    - MYSQL_DATABASE=gogs
-  restart: always
-
-phpmyadmin:
-  image: easypi/phpmyadmin-arm
-  ports:
-    - "8080:80"
-  environment:
-    - PMA_HOST=mysql
-    - PMA_PORT=3306
-  links:
-    - mysql
   restart: always
diff --git a/phpmyadmin/arm/docker-compose.yml b/phpmyadmin/arm/docker-compose.yml
index b14a4f0..4e9867f 100644
--- a/phpmyadmin/arm/docker-compose.yml
+++ b/phpmyadmin/arm/docker-compose.yml
@@ -3,6 +3,17 @@ phpmyadmin:
   ports:
     - "8080:80"
   environment:
-    - PMA_HOST=dbhost
+    - PMA_HOST=mysql
     - PMA_PORT=3306
+  links:
+    - mysql
+  restart: always
+
+mysql:
+  image: easypi/mariadb-arm
+  ports:
+    - "3306:3306"
+  environment:
+    - MYSQL_ROOT_PASSWORD=root
+    - MYSQL_DATABASE=wordpress
   restart: always