diff --git a/completions/bash/podman b/completions/bash/podman
index dfa6734811..798d49cebc 100644
--- a/completions/bash/podman
+++ b/completions/bash/podman
@@ -1727,6 +1727,7 @@ _podman_container_run() {
 		--memory-reservation
 		--name
 		--network
+		--no-hosts
 		--oom-score-adj
 		--pid
 		--pids-limit
diff --git a/docs/podman-create.1.md b/docs/podman-create.1.md
index 2e176db767..289bb71a33 100644
--- a/docs/podman-create.1.md
+++ b/docs/podman-create.1.md
@@ -204,6 +204,9 @@ configuration passed to the container. Typically this is necessary when the
 host DNS configuration is invalid for the container (e.g., 127.0.0.1). When this
 is the case the **--dns** flags is necessary for every run.
 
+The special sigil **none** can be specified to disable creation of **/etc/resolv.conf** in the container by Podman.
+The **/etc/resolv.conf** file in the image will be used without changes.
+
 **--dns-option**=[]
 
 Set custom DNS options
@@ -457,6 +460,13 @@ Set the Network mode for the container
 
 Not implemented
 
+**--no-hosts**=*true*|*false*
+
+Do not create /etc/hosts for the container.
+By default, Podman will manage /etc/hosts, adding the container's own IP address and any hosts from **--add-host**.
+**--no-hosts** disables this, and the image's **/etc/host** will be preserved unmodified.
+This conflicts with **--add-host**.
+
 **--oom-kill-disable**=*true*|*false*
 
 Whether to disable OOM Killer for the container or not.
diff --git a/docs/podman-run.1.md b/docs/podman-run.1.md
index b8b3d51f08..e045d033c2 100644
--- a/docs/podman-run.1.md
+++ b/docs/podman-run.1.md
@@ -210,6 +210,9 @@ configuration passed to the container. Typically this is necessary when the
 host DNS configuration is invalid for the container (e.g., 127.0.0.1). When this
 is the case the **--dns** flags is necessary for every run.
 
+The special sigil **none** can be specified to disable creation of **/etc/resolv.conf** in the container by Podman.
+The **/etc/resolv.conf** file in the image will be used without changes.
+
 **--dns-option**=[]
 
 Set custom DNS options
@@ -441,6 +444,13 @@ Set the Network mode for the container:
 
 Not implemented
 
+**--no-hosts**=*true*|*false*
+
+Do not create /etc/hosts for the container.
+By default, Podman will manage /etc/hosts, adding the container's own IP address and any hosts from **--add-host**.
+**--no-hosts** disables this, and the image's **/etc/host** will be preserved unmodified.
+This conflicts with **--add-host**.
+
 **--oom-kill-disable**=*true*|*false*
 
 Whether to disable OOM Killer for the container or not.