diff --git a/en-US/configure-sudo.adoc b/en-US/configure-sudo.adoc
index f2ba932..c171ab8 100644
--- a/en-US/configure-sudo.adoc
+++ b/en-US/configure-sudo.adoc
@@ -1,75 +1,29 @@
-= Configuring Sudo
+= Configuring sudo
 
-'''
+include::{md}/concept-what-is-sudo.adoc[leveloffset=+1]
 
-[IMPORTANT]
-======
+= How to use sudo
 
-This page was automatically converted from https://fedoraproject.org/wiki/Configuring_Sudo
+include::{md}/concept-using-sudo-assign-admin-privileges.adoc[leveloffset=+1]
 
-It is probably
+include::{md}/procedure-using-same-password-for-root-as-user.adoc[leveloffset=+1]
 
-* Badly formatted
-* Missing graphics and tables that do not convert well from mediawiki
-* Out-of-date
-* In need of other love
+include::{md}/concept-logging-sudo-commands.adoc[leveloffset=+1]
 
-Please fix it, remove this notice, and then add to `_topic_map.yml`
+[[concept-warning-and-caveats]]
+= Warnings and caveats
+You must use the `user` account you created following the installation process, at first boot, for daily use and the `root` account only for system administration. Avoid using `root` for any non-administration usage, since the account makes it easy to create security or data risks.
 
-Pull requests accepted at https://pagure.io/fedora-docs/quick-docs
+There are several potential risks to keep in mind when using the [command]`sudo` command. You can avoid them by editing the [filename]`/etc/sudoers` configuration file using [command]`visudo` command.
 
-Once that is live, go to the original wiki page and add an `{{old}}`
-tag, followed by a note like
+include::{md}/concept-sudo-timeout.adoc[leveloffset=+1]
 
-....
-{{admon/note|This page has a new home!|
-This wiki page is no longer maintained. Please find the up-to-date
-version at: https://docs.fedoraproject.org/whatever-the-url
-}}
-....
+include::{md}/concept-using-sudo-access-docker.adoc[leveloffset=+1]
 
-======
+include::{md}/procedure-run-docker-using-sudo.adoc[leveloffset=+1]
 
-'''
+include::{md}/concept-using-sudo-without-password.adoc[leveloffset=+1]
 
 
-Fedora users should use a regular user account for regular day to day
-activities and a root account only for system administration. Use the
-personal account you created following the installation process, at
-first boot, for daily use. Use the root account only for administration
-of your system.
-
-To run as root use the or commands. Avoid using root for any
-non-administration usage, since the root account makes it easy to create
-security or data risks. If you frequently use a single user desktop, you
-may find it convenient to configure so you can use the same password to
-access root as you use for your regular account. To do this, select to
-be added to the Administration group during installation. To do it
-later, or to add a different user, follow this procedure:
-
-1.  Become the root user using the command. Enter the password for the
-root account when prompted.
-+
-....
-su -
-....
-2.  Run this command, using your user account name in the place of
-"sampleusername":
-+
-....
-usermod sampleusername -a -G wheel
-....
-+
-You must now log off and back on in order to have access to the wheel
-group. Note that when prompts you for a password, it expects your user
-password, not root's.
-
-[[reference]]
-Reference
-~~~~~~~~~
-
-http://fedorasolved.org/post-install-solutions/sudo
-'''
-
 See a typo, something missing or out of date, or anything else which can be
 improved? Edit this document at https://pagure.io/fedora-docs/quick-docs.