diff --git a/.github/workflows/docker-builds.yaml b/.github/workflows/docker-builds.yaml
index 8a884ff..d88f836 100644
--- a/.github/workflows/docker-builds.yaml
+++ b/.github/workflows/docker-builds.yaml
@@ -15,6 +15,7 @@ jobs:
         test: [["sysstat", "ghcr.io/converged-computing/metric-sysstat:latest"],
                ["osu-benchmark", "ghcr.io/converged-computing/metric-osu-benchmark:latest"],
                ["fio", "ghcr.io/converged-computing/metric-fio:latest"],
+               ["amg", "ghcr.io/converged-computing/metric-amg:latest"],
                ["qmcpack", "ghcr.io/converged-computing/metric-qmcpack:latest"],
                ["nekbone", "ghcr.io/converged-computing/metric-nekbone:latest"],
                ["lammps", "ghcr.io/converged-computing/metric-lammps:latest"]] 
diff --git a/README.md b/README.md
index cc189b5..3e21cd4 100644
--- a/README.md
+++ b/README.md
@@ -16,9 +16,10 @@ them by tool.
  - [fio](fio)
  - [lammps](lammps)
  - [hacc](hacc) (this does not work outside of PowerPC)
- - [nekbone](nekbone)
+ - [nekbone](nekbone) with more information [in this PDF](https://github.com/AMDComputeLibraries/Nekbone/blob/amd-openmp/USERGUIDE.pdf)
  - [osu-benchmark](osu-benchmark)
- - [qmcpack](qmcpack)
+ - [qmcpack](qmcpack) and a [summary here](https://asc.llnl.gov/sites/asc/files/2020-09/coral2_qmcpack_vfeb13.pdf)
+ - [amg](amg) has problem examples [here](https://asc.llnl.gov/sites/asc/files/2020-09/AMG_Summary_v1_7.pdf)
 
 ## License
 
diff --git a/amg/Dockerfile b/amg/Dockerfile
new file mode 100644
index 0000000..2548ec2
--- /dev/null
+++ b/amg/Dockerfile
@@ -0,0 +1,30 @@
+ARG tag=latest
+FROM ubuntu:${tag}
+ENV DEBIAN_FRONTEND=noninteractive
+
+
+# see https://asc.llnl.gov/sites/asc/files/2020-09/AMG_Summary_v1_7.pdf
+RUN apt-get update && \
+    apt-get install -y fftw3-dev fftw3 pdsh libfabric-dev libfabric1 \
+        openssh-client openssh-server \
+        dnsutils telnet strace cmake git g++ \
+        mpich unzip bzip2
+
+WORKDIR /opt
+RUN git clone  https://github.com/LLNL/AMG.git && \
+    cd ./AMG && \
+    make
+
+ENV PATH=/opt/AMG/test:$PATH
+
+# Hack for ssh for now...
+RUN echo "        LogLevel ERROR" >> /etc/ssh/ssh_config && \
+    echo "        StrictHostKeyChecking no" >> /etc/ssh/ssh_config && \
+    echo "        UserKnownHostsFile=/dev/null" >> /etc/ssh/ssh_config && \
+    cd /root && \
+    mkdir -p /run/sshd && \
+    ssh-keygen -t rsa -N "" -f /root/.ssh/id_rsa && chmod og+rX . && \
+    cd .ssh && cat id_rsa.pub > authorized_keys && chmod 644 authorized_keys
+
+EXPOSE 22
+WORKDIR /opt/AMG