diff --git a/.travis.yml b/.travis.yml
index 0694495..7098d72 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ install:
 before_script:
   - env | sort
   - cd "$VARIANT"
-  - slash='/'; image="friendica:${VARIANT//$slash/-}"
+  - slash='/'; image="friendica/server:${VARIANT//$slash/-}"
 
 script:
   - docker build -t "$image" .
diff --git a/README.md b/README.md
index c45d949..115f901 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ If you use another container, make sure that you add them to the same docker net
 In both cases you don't want to map the fpm port to you host.
 
 ```console
-$ docker run -d friendica:fpm
+$ docker run -d friendica/server:fpm
 ```
 
 As the fastCGI-Process is not capable of serving static files (style sheets, images, ...) the webserver needs access to these files.
@@ -99,7 +99,7 @@ Friendica:
 ```console
 $ docker run -d \
   -v friendica-vol-1:/var/www/html \
-  friendica
+  friendica/server
 ```
 
 Database:
@@ -209,7 +209,7 @@ services:
       - MYSQL_RANDOM_ROOT_PASSWORD=yes
 
   app:
-    image: friendica
+    image: friendica/server
     restart: always
     volumes:
       - friendica:/var/www/html
@@ -264,7 +264,7 @@ services:
       - MYSQL_RANDOM_ROOT_PASSWORD=yes
 
   app:
-    image: friendica:fpm
+    image: friendica/server:fpm
     restart: always
     volumes:
       - friendica:/var/www/html    
diff --git a/pwd.yml b/pwd.yml
index 825f89c..9bc2032 100644
--- a/pwd.yml
+++ b/pwd.yml
@@ -13,7 +13,7 @@ services:
       - MYSQL_RANDOM_ROOT_PASSWORD=yes
 
   app:
-    image: friendica
+    image: friendica/server
     restart: always
     ports:
       - 8080:80
@@ -31,7 +31,7 @@ services:
       - db
 
   cron:
-    image: friendica
+    image: friendica/server
     restart: always
     volumes:
       - friendica:/var/www/html