diff --git a/.github/workflows/rogue_ci.yml b/.github/workflows/rogue_ci.yml
index 81487af53..1f8e2c909 100644
--- a/.github/workflows/rogue_ci.yml
+++ b/.github/workflows/rogue_ci.yml
@@ -240,7 +240,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
-          file: ./Dockerfile
+          file: ./docker/rogue
           push: true
           tags: tidair/rogue:${{ steps.get_image_info.outputs.tag }}, tidair/rogue:latest
           build-args: branch=${{ steps.get_image_info.outputs.branch }}
diff --git a/docker/rogue-anaconda/Dockerfile b/docker/rogue-anaconda/Dockerfile
new file mode 100644
index 000000000..5ee89f3ae
--- /dev/null
+++ b/docker/rogue-anaconda/Dockerfile
@@ -0,0 +1,19 @@
+FROM continuumio/anaconda3
+
+RUN apt-get update && \
+    apt-get install -y \
+      g++ \
+      gcc \
+      git \
+      cmake \
+      make
+
+RUN conda config --set channel_priority strict &&\
+    conda install -n base conda-libmamba-solver &&\
+    conda config --set solver libmamba
+
+RUN conda create -n rogue_tag -c tidair-tag -c conda-forge rogue
+
+RUN echo "source activate rogue_tag" > ~/.bashrc
+
+ENV PATH /opt/conda/envs/rogue_tag/bin:$PATH
diff --git a/Dockerfile b/docker/rogue/Dockerfile
similarity index 96%
rename from Dockerfile
rename to docker/rogue/Dockerfile
index 4afd12ed3..b0e02b969 100644
--- a/Dockerfile
+++ b/docker/rogue/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.10
+FROM ubuntu:22.04
 
 # Install system tools
 RUN apt-get update && apt-get install -y \
@@ -21,7 +21,7 @@ RUN pip3 install PyYAML parse click ipython pyzmq packaging matplotlib numpy p4p
 RUN pip3 install pydm>=1.18.0
 
 # Install Rogue
-ARG branch
+ARG branch=main
 WORKDIR /usr/local/src
 RUN git clone https://github.com/slaclab/rogue.git -b $branch
 WORKDIR rogue