diff --git a/gogs/arm/README.md b/gogs/arm/README.md
new file mode 100644
index 0000000..6ad50b8
--- /dev/null
+++ b/gogs/arm/README.md
@@ -0,0 +1,30 @@
+gogs-arm
+========
+
+```yaml
+Database Settings:
+    Database Type: MySQL
+    Host: mysql:3306
+    User: root
+    Password: root
+    Database Name: gogs
+
+Application General Settings:
+    Application Name: "Gogs: Go Git Service"
+    Repository Root Path: /data/git/gogs-repositories
+    Run User: git
+    Domain: 192.168.31.231
+    SSH Port: 2222
+    HTTP Port: 3000
+    Application URL: http://192.168.31.231:3000/
+    Log Path: /app/gogs/log
+
+Optional Settings:
+    Email Service Settings:
+    Server and Other Services Settings:
+    Admin Account Settings:
+        Username: root
+        Password: ******
+        Confirm Password: ******
+        Admin Email: root@easypi.info
+```
diff --git a/gogs/arm/docker-compose.yml b/gogs/arm/docker-compose.yml
index 0e6e002..a44326f 100644
--- a/gogs/arm/docker-compose.yml
+++ b/gogs/arm/docker-compose.yml
@@ -5,9 +5,11 @@ gogs:
     - "3000:3000"
   volumes:
     - ./data:/data
+  links:
+    - mysql
   restart: always
 
-db:
+mysql
   image: easypi/mariadb-arm
   ports:
     - "3306:3306"
@@ -20,6 +22,9 @@ phpmyadmin:
   image: easypi/phpmyadmin-arm
   ports:
     - "8080:80"
+  environment:
+    - PMA_HOST=mysql
+    - PMA_PORT=3306
   links:
-    - db
+    - mysql
   restart: always
diff --git a/phpmyadmin/arm/Dockerfile b/phpmyadmin/arm/Dockerfile
index c760d6c..0657018 100644
--- a/phpmyadmin/arm/Dockerfile
+++ b/phpmyadmin/arm/Dockerfile
@@ -2,8 +2,8 @@
 # Dockerfile for phpmyadmin-arm
 #
 
-FROM easypi/alpine-arm:3.4
-MAINTAINER kev <noreply@easypi.info>
+FROM easypi/alpine-arm
+MAINTAINER EasyPi Software Foundation
 
 WORKDIR /www/
 
@@ -26,6 +26,7 @@ RUN set -xe \
     && curl -sSL https://github.com/phpmyadmin/docker/raw/master/config.inc.php > ./config.inc.php \
     && curl -sSL https://github.com/phpmyadmin/docker/raw/master/run.sh > /run.sh \
     && chmod +x /run.sh \
+    && mkdir -p /sessions \
     && apk del curl tar \
     && rm -rf /var/cache/apk/*