diff --git a/apps/nitter/config.json b/apps/nitter/config.json
new file mode 100644
index 00000000..84bc147e
--- /dev/null
+++ b/apps/nitter/config.json
@@ -0,0 +1,12 @@
+{
+    "name": "Nitter",
+    "available": true,
+    "port": 8106,
+    "id": "nitter",
+    "description": "A free and open source alternative Twitter front-end focused on privacy and performance.",
+    "short_desc": "Twitter without annoyances!",
+    "author": "Stetsed",
+    "source": "https://github.com/zedeus/nitter",
+    "image": "https://raw.githubusercontent.com/zedeus/nitter/master/public/favicon.ico",
+    "form_fields": {}
+  } 
\ No newline at end of file
diff --git a/apps/nitter/data/nitter.conf b/apps/nitter/data/nitter.conf
new file mode 100644
index 00000000..5acc5be4
--- /dev/null
+++ b/apps/nitter/data/nitter.conf
@@ -0,0 +1,45 @@
+[Server]
+address = "0.0.0.0"
+port = 8080
+https = false  # disable to enable cookies when not using https
+httpMaxConnections = 100
+staticDir = "./public"
+title = "nitter"
+hostname = ""
+
+[Cache]
+listMinutes = 240  # how long to cache list info (not the tweets, so keep it high)
+rssMinutes = 10  # how long to cache rss queries
+redisHost = "nitter-redis"  # Change to "nitter-redis" if using docker-compose
+redisPort = 6379
+redisPassword = ""
+redisConnections = 20  # connection pool size
+redisMaxConnections = 30
+# max, new connections are opened when none are available, but if the pool size
+# goes above this, they're closed when released. don't worry about this unless
+# you receive tons of requests per second
+
+[Config]
+hmacKey = "secretkey"  # random key for cryptographic signing of video urls
+base64Media = false  # use base64 encoding for proxied media urls
+enableRSS = true  # set this to false to disable RSS feeds
+enableDebug = false  # enable request logs and debug endpoints
+proxy = ""  # http/https url, SOCKS proxies are not supported
+proxyAuth = ""
+tokenCount = 10
+# minimum amount of usable tokens. tokens are used to authorize API requests,
+# but they expire after ~1 hour, and have a limit of 187 requests.
+# the limit gets reset every 15 minutes, and the pool is filled up so there's
+# always at least $tokenCount usable tokens. again, only increase this if
+# you receive major bursts all the time
+
+# Change default preferences here, see src/prefs_impl.nim for a complete list
+[Preferences]
+theme = "Nitter"
+replaceTwitter = ""
+replaceYouTube = ""
+replaceReddit = ""
+replaceInstagram = ""
+proxyVideos = true
+hlsPlayback = true
+infiniteScroll = true 
\ No newline at end of file
diff --git a/apps/nitter/docker-compose.yml b/apps/nitter/docker-compose.yml
new file mode 100644
index 00000000..25c6fd70
--- /dev/null
+++ b/apps/nitter/docker-compose.yml
@@ -0,0 +1,28 @@
+version: "3"
+
+services:
+
+  nitter:
+    image: zedeus/nitter:latest
+    container_name: nitter
+    networks:
+      - tipi_main_network
+    ports:
+      - ${APP_PORT}:8080
+    volumes:
+      - "${APP_DATA_DIR}/data/nitter.conf:/src/nitter.conf:ro"
+    depends_on:
+      - nitter-redis
+    restart: unless-stopped
+  nitter-redis:
+    image: redis:6-alpine
+    container_name: nitter-redis
+    networks:
+      - tipi_main_network
+    command: redis-server --save 60 1 --loglevel warning
+    volumes:
+      - nitter-redis:/data
+    restart: unless-stopped
+
+volumes:
+  nitter-redis: 
\ No newline at end of file