diff --git a/.env.example b/.env.example
new file mode 100644
index 00000000..23d49b26
--- /dev/null
+++ b/.env.example
@@ -0,0 +1,5 @@
+POSTGRES_USER=miniflux
+POSTGRES_PASSWORD=change_me
+POSTGRES_DB=miniflux
+ADMIN_USERNAME=admin
+ADMIN_PASSWORD=change_me
diff --git a/.gitignore b/.gitignore
index a547bf36..a3fe0992 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,9 @@ dist
 dist-ssr
 *.local
 
+# Environment variables
+.env
+
 # Editor directories and files
 .vscode/*
 !.vscode/extensions.json
diff --git a/README.md b/README.md
index 06c91747..572f4f6e 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,10 @@
 
 A modern RSS reader client for [Miniflux](https://github.com/miniflux/v2) built with React + Vite.
 
+*NOTE*: This fork includes some features that have not merged into Nextflux;
+which are either pending or rejected by the main author of Nextflux due to
+differences in project vision or implementation approach.
+
 ![preview](images/preview.png)
 
 ## ✨ Features
@@ -110,7 +114,7 @@ A modern RSS reader client for [Miniflux](https://github.com/miniflux/v2) built
 Run with Docker using the following command:
 
 ```bash
-docker run -d --name nextflux -p 3000:3000 --restart unless-stopped electh/nextflux:latest
+docker run -d --name nextflux -p 3000:3000 --restart unless-stopped acartoonist/nextflux:latest
 ```
 
 ### Cloudflare Pages Deployment (standalone)
diff --git a/compose.yml b/compose.yml
index 32fb8b7d..336bf5cd 100644
--- a/compose.yml
+++ b/compose.yml
@@ -8,12 +8,12 @@ services:
       db:
         condition: service_healthy
     environment:
-      - DATABASE_URL=postgres://miniflux:secret@db/miniflux?sslmode=disable
+      - DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db/${POSTGRES_DB}?sslmode=disable
       - RUN_MIGRATIONS=1
       - CREATE_ADMIN=1
       - DISABLE_HSTS=1
-      - ADMIN_USERNAME=admin
-      - ADMIN_PASSWORD=test123
+      - ADMIN_USERNAME=${ADMIN_USERNAME}
+      - ADMIN_PASSWORD=${ADMIN_PASSWORD}
     healthcheck:
       test: ["CMD", "/usr/bin/miniflux", "-healthcheck", "auto"]
     restart: unless-stopped
@@ -21,9 +21,9 @@ services:
     image: postgres:17-alpine
     container_name: miniflux-db
     environment:
-      - POSTGRES_USER=miniflux
-      - POSTGRES_PASSWORD=secret
-      - POSTGRES_DB=miniflux
+      - POSTGRES_USER=${POSTGRES_USER}
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+      - POSTGRES_DB=${POSTGRES_DB}
     volumes:
       - miniflux-db:/var/lib/postgresql/data
     healthcheck:
@@ -32,7 +32,7 @@ services:
       start_period: 10s
     restart: unless-stopped
   nextflux:
-    image: electh/nextflux:latest
+    image: acartoonist/nextflux:latest
     container_name: nextflux
     ports:
       - 3000:3000
diff --git a/src/components/ArticleView/components/ActionButtons.jsx b/src/components/ArticleView/components/ActionButtons.jsx
index 57febbcf..0e1bff05 100644
--- a/src/components/ArticleView/components/ActionButtons.jsx
+++ b/src/components/ArticleView/components/ActionButtons.jsx
@@ -1,5 +1,6 @@
 import {
   ArrowLeft,
+  Archive,
   Circle,
   CircleDot,
   FileText,
@@ -267,6 +268,28 @@ export default function ActionButtons({ parentRef }) {
               </span>
             </Button>
           </Tooltip>
+          <Tooltip
+            content={t("articleView.archive")}
+            classNames={{ content: "shadow-custom!" }}
+          >
+            <Button
+              size="sm"
+              radius="full"
+              variant="light"
+              isIconOnly
+              isDisabled={!$activeArticle?.url}
+              onPress={() =>
+                window.open(
+                  `https://archive.ph/submit/?url=${encodeURIComponent($activeArticle?.url)}`,
+                  "_blank",
+                  "noopener,noreferrer",
+                )
+              }
+            >
+              <Archive className="size-4 text-default-500" />
+              <span className="sr-only">{t("articleView.archive")}</span>
+            </Button>
+          </Tooltip>
           <Tooltip
             content={t("common.share")}
             classNames={{ content: "shadow-custom!" }}
diff --git a/src/i18n/locales/en-US.js b/src/i18n/locales/en-US.js
index 4596d8f3..48b202ca 100644
--- a/src/i18n/locales/en-US.js
+++ b/src/i18n/locales/en-US.js
@@ -143,6 +143,7 @@ export default {
     getFullText: "Reader view",
     showSummary: "Hide reader view",
     saveToThirdParty: "Save to third-party services",
+    archive: "Web Archive",
     attachments: "Attachments",
   },
   player: {
diff --git a/src/i18n/locales/fr-FR.js b/src/i18n/locales/fr-FR.js
index 300a61be..3ad56a39 100644
--- a/src/i18n/locales/fr-FR.js
+++ b/src/i18n/locales/fr-FR.js
@@ -142,6 +142,7 @@ export default {
     getFullText: "Vue lecteur",
     showSummary: "Masquer la vue lecteur",
     saveToThirdParty: "Enregistrer dans des services tiers",
+    archive: "Archive web",
     attachments: "Pièces jointes",
   },
   player: {
diff --git a/src/i18n/locales/tr-TR.js b/src/i18n/locales/tr-TR.js
index 20aa75a8..84ec6ae0 100644
--- a/src/i18n/locales/tr-TR.js
+++ b/src/i18n/locales/tr-TR.js
@@ -143,6 +143,7 @@ export default {
     getFullText: "Okuma görünümü",
     showSummary: "Okuma görünümünü gizle",
     saveToThirdParty: "Üçüncü taraf hizmetlerine kaydet",
+    archive: "Web Arşivi",
     attachments: "Ekler",
   },
   player: {
diff --git a/src/i18n/locales/zh-CN.js b/src/i18n/locales/zh-CN.js
index 50ae8c31..9fa9fc02 100644
--- a/src/i18n/locales/zh-CN.js
+++ b/src/i18n/locales/zh-CN.js
@@ -142,6 +142,7 @@ export default {
     getFullText: "阅读模式",
     showSummary: "隐藏阅读模式",
     saveToThirdParty: "保存到第三方服务",
+    archive: "网页存档",
     attachments: "附件",
   },
   player: {