diff --git a/docker/freshrss/docker-compose.yml b/docker/freshrss/docker-compose.yml
index 1de8bfef..9d948bbb 100644
--- a/docker/freshrss/docker-compose.yml
+++ b/docker/freshrss/docker-compose.yml
@@ -13,6 +13,7 @@ services:
       - PGID=985
       - TZ=Europe/Helsinki
     depends_on:
+      - spotifeed
       - bibliogram
     volumes:
       - /docker/freshrss/freshrss:/config
@@ -33,6 +34,33 @@ services:
       - "traefik.docker.network=proxy"
       - "traefik.http.services.freshrss.loadbalancer.server.port=80"
 
+  spotifeed:
+    build: ./spotifeed
+    image: spotifeed
+    container_name: spotifeed
+    environment:
+      - SPOTIFY_CLIENT_ID=${SPOTIFY_CLIENT_ID}
+      - SPOTIFY_CLIENT_SECRET=${SPOTIFY_CLIENT_SECRET}
+    restart: unless-stopped
+    networks:
+      - freshrss
+      - proxy
+    labels:
+      - "traefik.enable=true"
+
+      - "traefik.http.routers.spotifeed-redirect.entrypoints=http"
+      - "traefik.http.routers.spotifeed-redirect.rule=Host(`spotifeed.korhonen.cc`)"
+      - "traefik.http.middlewares.http2https.redirectscheme.scheme=https"
+      - "traefik.http.routers.spotifeed-redirect.middlewares=http2https"
+
+      - "traefik.http.routers.spotifeed.entrypoints=https"
+      - "traefik.http.routers.spotifeed.rule=Host(`spotifeed.korhonen.cc`)"
+      - "traefik.http.routers.spotifeed.tls=true"
+      - "traefik.http.routers.spotifeed.tls.certresolver=http"
+      - "traefik.http.routers.spotifeed.service=spotifeed"
+      - "traefik.docker.network=proxy"
+      - "traefik.http.services.spotifeed.loadbalancer.server.port=8083"
+
   bibliogram:
     image: cloudrac3r/bibliogram
     container_name: bibliogram
diff --git a/docker/freshrss/spotifeed/Dockerfile b/docker/freshrss/spotifeed/Dockerfile
new file mode 100644
index 00000000..63c1604d
--- /dev/null
+++ b/docker/freshrss/spotifeed/Dockerfile
@@ -0,0 +1,9 @@
+FROM ruby:2.7.2
+RUN git clone https://github.com/timdorr/spotifeed
+WORKDIR /spotifeed
+RUN bundle install
+EXPOSE 8083
+RUN apt-get update
+RUN apt-get upgrade
+RUN apt-get install redis-server -y
+CMD puma -p 8083 & redis-server
diff --git a/docker/homeautomation/docker-compose.yml b/docker/homeautomation/docker-compose.yml
index a42a39f3..ea29011d 100644
--- a/docker/homeautomation/docker-compose.yml
+++ b/docker/homeautomation/docker-compose.yml
@@ -17,7 +17,6 @@ services:
       - proxy
     ports:
       - "8123:8123"
-      - "8300:8300"
     depends_on:
       - mosquitto
     labels: