From 2af2bbb3f29039c9af9b88b0bea6061446870407 Mon Sep 17 00:00:00 2001
From: bquan0 <powerbowen@gmail.com>
Date: Fri, 24 Nov 2023 14:33:12 -0600
Subject: [PATCH 1/3] add apt and conda changes to build_test.yml

---
 .github/workflows/build_test.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 05e57af849..e69af0a3d4 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -31,15 +31,20 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
+        pkg_mgr: ['apt', 'conda']
         stage: [base_python, moab, dagmc, openmc]
         hdf5: ['']
         include:
-          - stage: dagmc
+          - pkg_mgr: 'apt'
+            stage: dagmc
+            hdf5: _hdf5
+          - pkg_mgr: 'conda'
+            stage: dagmc
             hdf5: _hdf5
       fail-fast: false
 
     container:
-      image: ghcr.io/pyne/pyne_ubuntu_22.04_py3${{ matrix.hdf5 }}/${{ matrix.stage }}:stable
+      image: ghcr.io/pyne/pyne_ubuntu_22.04_py3_${{ matrix.pkg_mgr }}${{ matrix.hdf5 }}/${{ matrix.stage }}:stable
 
     steps:
       - name: Checkout repository

From 93c0a66de65e002a14bafacfdbe456a623ac2d10 Mon Sep 17 00:00:00 2001
From: bquan0 <powerbowen@gmail.com>
Date: Fri, 24 Nov 2023 14:42:56 -0600
Subject: [PATCH 2/3] fix double apt typo in docker_publish.yml and update
 CHANGELOG.rst

---
 .github/workflows/docker_publish.yml | 2 +-
 CHANGELOG.rst                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker_publish.yml b/.github/workflows/docker_publish.yml
index 5f1cfe23d3..37d038b9ca 100644
--- a/.github/workflows/docker_publish.yml
+++ b/.github/workflows/docker_publish.yml
@@ -133,7 +133,7 @@ jobs:
           - pkg_mgr: 'apt'
             stage: dagmc
             hdf5: _hdf5
-          - pkg_mgr: 'apt'
+          - pkg_mgr: 'conda'
             stage: dagmc
             hdf5: _hdf5
 
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 77cff52da3..ebbb30b64c 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -7,7 +7,7 @@ Next Version
 **Change**
    * Move tests from nose to pytest (#1478 #1493)
    * Update MOAB dead link and add PyNE logo to readme file (#1481)
-   * Install packages with conda in Dockerfile (#1509)
+   * Install packages with conda in Dockerfile (#1509 #1510)
 
 **Fix**
    * Add missing rxname offsets (#1482)

From f1b516610cf9dea6f4a80bfe63ccb881c3c3250c Mon Sep 17 00:00:00 2001
From: bquan0 <powerbowen@gmail.com>
Date: Fri, 24 Nov 2023 17:12:09 -0600
Subject: [PATCH 3/3] revert changes in build_test.yml again

---
 .github/workflows/build_test.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index e69af0a3d4..05e57af849 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -31,20 +31,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        pkg_mgr: ['apt', 'conda']
         stage: [base_python, moab, dagmc, openmc]
         hdf5: ['']
         include:
-          - pkg_mgr: 'apt'
-            stage: dagmc
-            hdf5: _hdf5
-          - pkg_mgr: 'conda'
-            stage: dagmc
+          - stage: dagmc
             hdf5: _hdf5
       fail-fast: false
 
     container:
-      image: ghcr.io/pyne/pyne_ubuntu_22.04_py3_${{ matrix.pkg_mgr }}${{ matrix.hdf5 }}/${{ matrix.stage }}:stable
+      image: ghcr.io/pyne/pyne_ubuntu_22.04_py3${{ matrix.hdf5 }}/${{ matrix.stage }}:stable
 
     steps:
       - name: Checkout repository