CSCfi · rkronberg · Jun 30, 2025 · Jun 24, 2025 · Jun 24, 2025 · Jun 25, 2025
diff --git a/docs/accounts/billing.md b/docs/accounts/billing.md
@@ -18,7 +18,6 @@ at research.csc.fi.
    data stored in Allas is billed.
 * [Pouta billing](../cloud/pouta/accounting.md)
 * [Rahti billing](../cloud/rahti/billing.md)
-* [Kvasi billing](../computing/quantum-computing/kvasi/kvasi-billing.md)
 * [SD Connect and SD Desktop billing](../data/sensitive-data/sd-use-case-new-user-project-manager.md#sd-connect-bu-consumption)
 
 

diff --git a/docs/accounts/index.md b/docs/accounts/index.md
@@ -14,7 +14,7 @@ The Project Manager is typically a leader of a research team or other senior res
 *   **Billing Units** (BUs) are used to allocate resources to users' projects. You can apply for Billing Units in [MyCSC](https://my.csc.fi) portal and CSC grants BUs to projects. [Usage consumes billing units](billing.md) but **no actual payment** is required.
 However, the amount of billing units must always remain positive.
 
-*   **LUMI projects** used to manage access to LUMI and the resources provided by it. LUMI projects are restricted to LUMI environment only (LUMI-C, LUMI-G etc.). Finnish LUMI projects are fixed in time and resources, and the total resources must be defined already in the project application. Lumi projects are also used for [Helmi quantum computer](../computing/quantum-computing/helmi/helmi-from-lumi.md). For further information please see [these instructions](https://www.lumi-supercomputer.eu/get-started-2021/users-in-finland/){:target="_blank"}. 
+*   **LUMI projects** used to manage access to LUMI and the resources provided by it. LUMI projects are restricted to LUMI environment only (LUMI-C, LUMI-G etc.). Finnish LUMI projects are fixed in time and resources, and the total resources must be defined already in the project application. Lumi projects are also used for [Fiqci quantum computers](../computing/quantum-computing/quantum-computers/access.md). For further information please see [these instructions](https://www.lumi-supercomputer.eu/get-started-2021/users-in-finland/){:target="_blank"}. 
 
 *   **My.csc.fi portal** MyCSC is the self-service CSC customer portal for research and education customers and end-users. MyCSC is also available for any other CSC customer or end-user, if they have CSC user accounts according to the CSCID policies.
 MyCSC portal offers users the functionality for registering CSC user accounts, creating computing or data projects, adding members to projects, and applying resources for projects. Users can also manage their projects and project lifecycles through MyCSC, and they can see the resources consumption and amount of stored data there.

diff --git a/docs/apps/cirq-on-iqm.md b/docs/apps/cirq-on-iqm.md
@@ -14,16 +14,16 @@ catalog:
 # Cirq-on-iqm
 
 Cirq on IQM is an open-source cirq adapter for IQM quantum computers. It is
-installed as `fiqci-vtt-cirq` on LUMI. It is used for running quantum circuits on
-[Helmi](../computing/quantum-computing/helmi/running-on-helmi.md).
+installed as `fiqci-vtt-cirq` on LUMI. It is used for running quantum circuits on the
+[quantum computers](../computing/quantum-computing/quantum-computers/running-quantum-jobs.md).
 
 ## Available
 
 Currently supported [cirq-on-iqm](https://iqm-finland.github.io/cirq-on-iqm/) versions:
 
 | Version | Module                               | LUMI  | Notes           |
 |:--------|:-------------------------------------|:-----:|-----------------|
-| 15.2    | `fiqci-vtt-cirq/15.2`                    | X     |                 |
+| 16.2   | `fiqci-vtt-cirq/16.2`                    | X     |                 |
 
 
 All modules are based on Tykky using LUMI-container-wrapper.
@@ -61,14 +61,14 @@ module avail fiqci-vtt-cirq
 
 ### Example batch script
 
-Example batch script for running a quantum job on Helmi:
+Example batch script for running a quantum job:
 
 ```bash title="LUMI"
 #!/bin/bash -l
 
-#SBATCH --job-name=helmijob     # Job name
-#SBATCH --output=helmijob.o%j   # Name of stdout output file
-#SBATCH --error=helmijob.e%j    # Name of stderr error file
+#SBATCH --job-name=quantumjob     # Job name
+#SBATCH --output=quantumjob.o%j   # Name of stdout output file
+#SBATCH --error=quantumjob.e%j    # Name of stderr error file
 #SBATCH --partition=q_fiqci     # Partition (queue) name
 #SBATCH --ntasks=1              # One task (process)
 #SBATCH --cpus-per-task=1       # Number of cores (threads)
@@ -79,6 +79,9 @@ Example batch script for running a quantum job on Helmi:
 module use /appl/local/quantum/modulefiles
 module load fiqci-vtt-cirq
 
+export DEVICES=("Q5") #export DEVICES=("Q5" "Q50") to use Helmi and Q50
+source /appl/local/quantum/fiqci_vtt/scripts/run_script.sh
+
 python -u quantum_job.py
 ```
 
@@ -87,4 +90,4 @@ Submit the script with `sbatch <script_name>.sh`.
 ## More information
 
 - [Cirq-IQM documentation](https://iqm-finland.github.io/cirq-on-iqm/user_guide.html)
-- [Quantum-Computing](../computing/quantum-computing/helmi/running-on-helmi.md)
+- [Quantum-Computing](../computing/quantum-computing/quantum-computers/running-quantum-jobs.md)
diff --git a/docs/apps/qiskit-on-iqm.md b/docs/apps/qiskit-on-iqm.md
@@ -14,8 +14,8 @@ catalog:
 # Qiskit-on-iqm
 
 Qiskit on IQM is an open-source qiskit adapter for IQM quantum computers. It is
-installed as `fiqci-vtt-qiskit` on LUMI. It is used for running quantum circuits on
-[Helmi](../computing/quantum-computing/helmi/running-on-helmi.md).
+installed as `fiqci-vtt-qiskit` on LUMI. It is used for running quantum circuits on the
+[quantum computers](../computing/quantum-computing/quantum-computers/running-quantum-jobs.md).
 
 
 ## Available
@@ -25,7 +25,7 @@ versions:
 
 | Version | Module                               | LUMI  | Notes           |
 |:--------|:-------------------------------------|:-----:|-----------------|
-| 15.5    | `fiqci-vtt-qiskit/15.5`                  | X     |                 |
+| 17.8    | `fiqci-vtt-qiskit/17.8`                  | X     |                 |
 
 All modules are based on Tykky using LUMI-container-wrapper.
 Wrapper scripts have been provided so that common commands such as `python`,
@@ -62,14 +62,14 @@ module avail fiqci-vtt-qiskit
 
 ### Example batch script
 
-Example batch script for running a quantum job on Helmi:
+Example batch script for running a quantum job:
 
 ```bash title="LUMI"
 #!/bin/bash -l
 
-#SBATCH --job-name=helmijob     # Job name
-#SBATCH --output=helmijob.o%j   # Name of stdout output file
-#SBATCH --error=helmijob.e%j    # Name of stderr error file
+#SBATCH --job-name=quantumjob     # Job name
+#SBATCH --output=quantumjob.o%j   # Name of stdout output file
+#SBATCH --error=quantumjob.e%j    # Name of stderr error file
 #SBATCH --partition=q_fiqci     # Partition (queue) name
 #SBATCH --ntasks=1              # One task (process)
 #SBATCH --cpus-per-task=1       # Number of cores (threads)
@@ -79,7 +79,8 @@ Example batch script for running a quantum job on Helmi:
 
 module use /appl/local/quantum/modulefiles
 module load fiqci-vtt-qiskit
-
+export DEVICES=("Q5") #export DEVICES=("Q5" "Q50") to use Helmi and Q50
+source /appl/local/quantum/fiqci_vtt/scripts/run_script.sh
 python -u quantum_job.py
 ```
 
@@ -88,4 +89,4 @@ Submit the script with `sbatch <script_name>.sh`.
 ## More information
 
 - [Qiskit-IQM documentation](https://iqm-finland.github.io/qiskit-on-iqm/)
-- [Quantum-Computing](../computing/quantum-computing/helmi/running-on-helmi.md)
+- [Quantum-Computing](../computing/quantum-computing/quantum-computers/running-quantum-jobs.md)
diff --git a/docs/apps/qiskit.md b/docs/apps/qiskit.md
@@ -17,8 +17,8 @@ catalog:
 
 Qiskit is an open-source software for working with quantum computers at the level of circuits, pulses, and algorithms. 
 This page contains information in regard to running Quantum simulations using qiskit inside of a singularity container.
-For information pertaining to running jobs on Helmi using qiskit please refer to this documentation: 
-[Running on Helmi](../computing/quantum-computing/helmi/running-on-helmi.md).
+For information pertaining to running jobs on the physical quantum computers using qiskit please refer to this documentation: 
+[Running quantum jobs](../computing/quantum-computing/quantum-computers/running-quantum-jobs.md).
 
 !!! info "News"
      **19.02.2025** Installed `qiskit/1.3.2` in a singularity container on LUMI with all major Qiskit packages and

diff --git a/docs/computing/available-systems.md b/docs/computing/available-systems.md
@@ -1,7 +1,7 @@
 # Systems
 
 CSC's computing environment consists of supercomputers Puhti and
-Mahti, and the quantum learning machine Kvasi. Puhti and Mahti have a
+Mahti. Puhti and Mahti have a
 fairly similar compute environment, and there is a wide range of
 workloads that can utilize both efficiently. At the same time their
 hardware is different, and this makes some worklods uniquely suitable

diff --git a/docs/computing/quantum-computing/helmi/fiqci-partition.md b/docs/computing/quantum-computing/helmi/fiqci-partition.md
diff --git a/docs/computing/quantum-computing/helmi/helmi-from-lumi.md b/docs/computing/quantum-computing/helmi/helmi-from-lumi.md
diff --git a/docs/computing/quantum-computing/helmi/helmi-projects.md b/docs/computing/quantum-computing/helmi/helmi-projects.md
diff --git a/docs/computing/quantum-computing/kvasi/kvasi-billing.md b/docs/computing/quantum-computing/kvasi/kvasi-billing.md
diff --git a/docs/computing/quantum-computing/kvasi/kvasi.md b/docs/computing/quantum-computing/kvasi/kvasi.md