diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35f6a91c64..b815986cca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 This changelog format was introduced in NAV 5.4.0. Older changelogs can be
 found in the [HISTORY](HISTORY) file.
 
+## [Unreleased]
+
+### Fixed
+
+- Avoid running command line scripts twice on every invocation ([#2877](https://github.com/Uninett/nav/issues/2877), [#2878](https://github.com/Uninett/nav/pull/2878))
+
 ## [5.9.1] - 2024-03-15
 
 ### Fixed
diff --git a/pyproject.toml b/pyproject.toml
index d93bda62c7..3176e86925 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -43,10 +43,10 @@ navdf = "nav.bin.navdf:main"
 navdump = "nav.bin.navdump:main"
 naventity = "nav.bin.naventity:main"
 navoidverify = "nav.bin.navoidverify:main"
-navpgdump = "nav.bin.navpgdump:main"
+navpgdump = "nav.pgdump:main"
 navsnmp = "nav.bin.navsnmp:main"
 navstats = "nav.bin.navstats:main"
-navsyncdb = "nav.bin.navsyncdb:main"
+navsyncdb = "nav.pgsync:main"
 navsynctypes = "nav.bin.navsynctypes:main"
 navtopology = "nav.bin.navtopology:main"
 navuser = "nav.bin.navuser:main"
diff --git a/python/nav/bin/navpgdump.py b/python/nav/bin/navpgdump.py
deleted file mode 100755
index f85ffbf0f8..0000000000
--- a/python/nav/bin/navpgdump.py
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env python
-# -*- testargs: --only-open-arp -*-
-from nav.pgdump import *
-
-main()
diff --git a/python/nav/bin/navsyncdb.py b/python/nav/bin/navsyncdb.py
deleted file mode 100755
index ccb66e4e11..0000000000
--- a/python/nav/bin/navsyncdb.py
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env python
-from nav.pgsync import main
-
-main()
diff --git a/python/nav/bin/navtopology.py b/python/nav/bin/navtopology.py
index 375af78273..220db8d740 100755
--- a/python/nav/bin/navtopology.py
+++ b/python/nav/bin/navtopology.py
@@ -5,4 +5,5 @@
 
 from nav.topology.detector import main
 
-main()
+if __name__ == '__main__':
+    main()