diff --git a/tensorflow-cpu.yaml b/tensorflow-cpu.yaml
index 6b460de7fda..ee105014939 100644
--- a/tensorflow-cpu.yaml
+++ b/tensorflow-cpu.yaml
@@ -14,12 +14,13 @@ package:
       - build-base
       - curl
       - pkgconf
-      - py3.11-pip
-      - python-3.11
+      - py${{vars.py-version}}-pip
+      - python-${{vars.py-version}}-dev
       - unzip
 
 vars:
-  pypi-package: tensorflow
+  py-version: 3.11
+  pypi-package: tensorflow-cpu
   prefix: /usr
 
 environment:
@@ -27,8 +28,8 @@ environment:
     packages:
       - build-base
       - busybox
-      - py3.11-pip
-      - python-3.11
+      - py${{vars.py-version}}-pip
+      - python-${{vars.py-version}}
   environment:
     # This is needed to work around the error "ValueError: ZIP does not support timestamps before 1980"
     SOURCE_DATE_EPOCH: 315532800
@@ -44,21 +45,21 @@ pipeline:
     pipeline:
       - name: Install cpu requirements
         runs: |
-          python3 -m pip install \
+          pip${{vars.py-version}} install \
             --no-cache-dir \
             --root ${{targets.contextdir}} \
             --prefix ${{vars.prefix}} \
             -r cpu.requirements.txt
       - name: Install Tensorflow
         runs: |
-          python3 -m pip install \
+          pip${{vars.py-version}} install \
             --no-cache-dir \
             --root ${{targets.contextdir}} \
             --prefix ${{vars.prefix}} \
             ${{vars.pypi-package}}
       - name: Install jupyter requirements
         runs: |
-          python3 -m pip install \
+          pip${{vars.py-version}} install \
             --no-cache-dir \
             --root ${{targets.contextdir}} \
             --prefix ${{vars.prefix}} \
@@ -83,8 +84,10 @@ test:
         - curl
   pipeline:
     - name: Test import of IPython kernel for Jupyter
-      runs: |
-        python3 -m ipykernel.kernelspec
+      uses: python/import
+      with:
+        imports: |
+          import ipykernel.kernelspec
     - name: Test Tensorflow library
       runs: |
         cat <<"EOF" >test.py
@@ -105,7 +108,7 @@ test:
         c = tf.add(a, b)
         print("Result of addition:", c.numpy())
         EOF
-        python test.py
+        python${{vars.py-version}} test.py
     - name: Test Juputer notebook run
       runs: |
         jupyter notebook --notebook-dir=/tf --ip 0.0.0.0 --no-browser --allow-root >/dev/null 2>&1 &
@@ -113,6 +116,7 @@ test:
         sleep 5
         curl --fail --location --request GET --head --silent localhost:8888
         kill $pid
+    - runs: python${{vars.py-version}} -m pip --version
 
 update:
   enabled: true